Compare commits

..

No commits in common. "44117c4da74f2ae9b6bbe86841417d2798696985" and "fcdeb75db68ad4978dc6473bc14b0dce2f7f3937" have entirely different histories.

21 changed files with 76 additions and 90 deletions

View File

@ -4,8 +4,8 @@
# This file should be version controlled. # This file should be version controlled.
version: version:
revision: 18a827f3933c19f51862dde3fa472197683249d6 revision: 13a2fb10b838971ce211230f8ffdd094c14af02c
channel: stable channel: beta
project_type: app project_type: app
@ -13,14 +13,11 @@ project_type: app
migration: migration:
platforms: platforms:
- platform: root - platform: root
create_revision: 18a827f3933c19f51862dde3fa472197683249d6 create_revision: 13a2fb10b838971ce211230f8ffdd094c14af02c
base_revision: 18a827f3933c19f51862dde3fa472197683249d6 base_revision: 13a2fb10b838971ce211230f8ffdd094c14af02c
- platform: android
create_revision: 18a827f3933c19f51862dde3fa472197683249d6
base_revision: 18a827f3933c19f51862dde3fa472197683249d6
- platform: linux - platform: linux
create_revision: 18a827f3933c19f51862dde3fa472197683249d6 create_revision: 13a2fb10b838971ce211230f8ffdd094c14af02c
base_revision: 18a827f3933c19f51862dde3fa472197683249d6 base_revision: 13a2fb10b838971ce211230f8ffdd094c14af02c
# User provided section # User provided section

View File

@ -44,7 +44,7 @@ android {
defaultConfig { defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.example" applicationId "me.polynom.moxdns_example"
// You can update the following values to match your application needs. // You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
minSdkVersion flutter.minSdkVersion minSdkVersion flutter.minSdkVersion

View File

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.example"> package="me.polynom.moxdns_example">
<!-- The INTERNET permission is required for development. Specifically, <!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc. to allow setting breakpoints, to provide hot reload, etc.

View File

@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.example"> package="me.polynom.moxdns_example">
<application <application
android:label="example" android:label="moxdns_example"
android:name="${applicationName}" android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"> android:icon="@mipmap/ic_launcher">
<activity <activity

View File

@ -1,4 +1,4 @@
package com.example.example package me.polynom.moxdns_example
import io.flutter.embedding.android.FlutterActivity import io.flutter.embedding.android.FlutterActivity

View File

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.example"> package="me.polynom.moxdns_example">
<!-- The INTERNET permission is required for development. Specifically, <!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc. to allow setting breakpoints, to provide hot reload, etc.

View File

@ -1,3 +1,4 @@
#Fri Jun 23 08:50:38 CEST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

View File

@ -7,7 +7,7 @@ project(runner LANGUAGES CXX)
set(BINARY_NAME "example") set(BINARY_NAME "example")
# The unique GTK application identifier for this application. See: # The unique GTK application identifier for this application. See:
# https://wiki.gnome.org/HowDoI/ChooseApplicationID # https://wiki.gnome.org/HowDoI/ChooseApplicationID
set(APPLICATION_ID "com.example.example") set(APPLICATION_ID "me.polynom.example")
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
# versions of CMake. # versions of CMake.

View File

@ -7,7 +7,7 @@ packages:
name: async name: async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.9.0" version: "2.8.2"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:
@ -21,14 +21,21 @@ packages:
name: characters name: characters
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.1" version: "1.2.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.1"
clock: clock:
dependency: transitive dependency: transitive
description: description:
name: clock name: clock
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.1" version: "1.1.0"
collection: collection:
dependency: transitive dependency: transitive
description: description:
@ -49,7 +56,7 @@ packages:
name: fake_async name: fake_async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.1" version: "1.3.0"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -80,63 +87,63 @@ packages:
name: matcher name: matcher
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.12" version: "0.12.11"
material_color_utilities: material_color_utilities:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.5" version: "0.1.4"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.0" version: "1.7.0"
moxdns: moxdns:
dependency: "direct main" dependency: "direct main"
description: description:
path: "../packages/moxdns" path: "../packages/moxdns"
relative: true relative: true
source: path source: path
version: "0.1.4" version: "0.1.1"
moxdns_android: moxdns_android:
dependency: "direct overridden" dependency: "direct overridden"
description: description:
path: "../packages/moxdns_android" path: "../packages/moxdns_android"
relative: true relative: true
source: path source: path
version: "0.1.4" version: "0.1.1"
moxdns_linux: moxdns_linux:
dependency: "direct overridden" dependency: "direct overridden"
description: description:
path: "../packages/moxdns_linux" path: "../packages/moxdns_linux"
relative: true relative: true
source: path source: path
version: "0.1.4" version: "0.1.1"
moxdns_platform_interface: moxdns_platform_interface:
dependency: "direct overridden" dependency: "direct overridden"
description: description:
path: "../packages/moxdns_platform_interface" path: "../packages/moxdns_platform_interface"
relative: true relative: true
source: path source: path
version: "0.1.4" version: "0.1.1"
path: path:
dependency: transitive dependency: transitive
description: description:
name: path name: path
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.2" version: "1.8.1"
plugin_platform_interface: plugin_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: plugin_platform_interface name: plugin_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.2" version: "2.1.0"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@ -148,7 +155,7 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.9.0" version: "1.8.2"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
@ -169,21 +176,21 @@ packages:
name: string_scanner name: string_scanner
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.1" version: "1.1.0"
term_glyph: term_glyph:
dependency: transitive dependency: transitive
description: description:
name: term_glyph name: term_glyph
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.1" version: "1.2.0"
test_api: test_api:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.12" version: "0.4.9"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:

View File

@ -32,7 +32,7 @@ dependencies:
moxdns: moxdns:
hosted: https://pub.polynom.me hosted: https://pub.polynom.me
version: 0.1.4+1 version: 0.1.1
# The following adds the Cupertino Icons font to your application. # The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.

View File

@ -17,16 +17,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1667879206, "lastModified": 1650034868,
"narHash": "sha256-fHiB8mIUotFpbvugTJ9ImYJ6q0ry2QVFHYox6YRHHaE=", "narHash": "sha256-OAaf5BdWKGXTXvYnbvJuoQjSWnVKgt1cIOChF0MFt2o=",
"owner": "NixOS", "owner": "PapaTutuWawa",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "295778ad21806918c16176164497f2793e2133f4", "rev": "13a5646d450052b88067cab37b198f8a2737e431",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "PapaTutuWawa",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable-flutter-2.13.0-0.1.pre",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@ -1,7 +1,7 @@
{ {
description = "moxlib"; description = "moxlib";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:PapaTutuWawa/nixpkgs/nixos-unstable-flutter-2.13.0-0.1.pre";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
@ -26,11 +26,11 @@
useGoogleAPIs = false; useGoogleAPIs = false;
useGoogleTVAddOns = false; useGoogleTVAddOns = false;
}; };
pinnedJDK = pkgs.jdk; pinnedJDK = pkgs.jdk11;
in { in {
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
flutter pinnedJDK android.platform-tools dart # Flutter flutterPackages.beta pinnedJDK android.platform-tools flutterPackages.dart-beta # Flutter
gitlint jq # Code hygiene gitlint jq # Code hygiene
ripgrep # General utilities ripgrep # General utilities
@ -56,7 +56,7 @@
CPATH = "${pkgs.xorg.libX11.dev}/include:${pkgs.xorg.xorgproto}/include"; CPATH = "${pkgs.xorg.libX11.dev}/include:${pkgs.xorg.xorgproto}/include";
LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [ atk cairo epoxy gdk-pixbuf glib gtk3 harfbuzz pango ]; LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [ atk cairo epoxy gdk-pixbuf glib gtk3 harfbuzz pango ];
ANDROID_HOME = (toString ./.) + "/.android/sdk"; ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
JAVA_HOME = pinnedJDK; JAVA_HOME = pinnedJDK;
ANDROID_AVD_HOME = (toString ./.) + "/.android/avd"; ANDROID_AVD_HOME = (toString ./.) + "/.android/avd";
}; };

View File

@ -1,7 +1,3 @@
## 0.1.4+1
- **REFACTOR**: Migrate to using melos.
## 0.1.0 ## 0.1.0
* Initial release * Initial release

View File

@ -1,8 +1,8 @@
name: moxdns name: moxdns
description: A simple wrapper over platform native DNS methods description: A simple wrapper over platform native DNS methods
version: 0.1.4+1 version: 0.1.2
homepage: https://codeberg.org/moxxy/moxdns homepage: https://codeberg.org/moxxy/moxdns
publish_to: https://git.polynom.me/api/packages/Moxxy/pub publish_to: https://pub.polynom.me
environment: environment:
sdk: ">=2.17.0-266.1.beta <3.0.0" sdk: ">=2.17.0-266.1.beta <3.0.0"
@ -21,14 +21,14 @@ dependencies:
sdk: flutter sdk: flutter
moxdns_android: moxdns_android:
hosted: https://git.polynom.me/api/packages/Moxxy/pub hosted: https://pub.polynom.me
version: 0.1.4+1 version: 0.1.2
moxdns_linux: moxdns_linux:
hosted: https://git.polynom.me/api/packages/Moxxy/pub hosted: https://pub.polynom.me
version: 0.1.4+1 version: 0.1.2
moxdns_platform_interface: moxdns_platform_interface:
hosted: https://git.polynom.me/api/packages/Moxxy/pub hosted: https://pub.polynom.me
version: 0.1.4+1 version: 0.1.2
dev_dependencies: dev_dependencies:
flutter_lints: ^2.0.0 flutter_lints: ^2.0.0

View File

@ -1,9 +1,3 @@
## 0.1.4+1
- **REFACTOR**: Migrate to using melos.
- **FIX**: Crashing due to incorrect type casting.
- **FIX**: Crashing when no internet is available.
## 0.1.0 ## 0.1.0
* Initial release * Initial release

View File

@ -1,8 +1,8 @@
name: moxdns_android name: moxdns_android
description: Android-specific implementation of moxdns description: Android-specific implementation of moxdns
version: 0.1.4+1 version: 0.1.2
homepage: https://codeberg.org/moxxy/moxdns homepage: https://codeberg.org/moxxy/moxdns
publish_to: https://git.polynom.me/api/packages/Moxxy/pub publish_to: https://pub.polynom.me
environment: environment:
sdk: ">=2.17.0-266.1.beta <3.0.0" sdk: ">=2.17.0-266.1.beta <3.0.0"
@ -13,13 +13,13 @@ dependencies:
sdk: flutter sdk: flutter
moxdns: moxdns:
hosted: https://git.polynom.me/api/packages/Moxxy/pub hosted: https://pub.polynom.me
version: 0.1.4+1 version: 0.1.2
moxdns_platform_interface: moxdns_platform_interface:
hosted: https://git.polynom.me/api/packages/Moxxy/pub hosted: https://pub.polynom.me
version: 0.1.4+1 version: 0.1.2
plugin_platform_interface: 2.1.2 plugin_platform_interface: 2.1.0
dev_dependencies: dev_dependencies:
flutter_lints: ^2.0.0 flutter_lints: ^2.0.0

View File

@ -1,8 +1,3 @@
## 0.1.4+1
- **REFACTOR**: Migrate to using melos.
- **FIX**: Crashing due to incorrect type casting.
## 0.1.0 ## 0.1.0
* Initial release * Initial release

View File

@ -27,10 +27,10 @@ class MoxdnsLinuxPlugin extends MoxdnsPlatform {
continue; continue;
} }
// ignore: argument_type_not_assignable // ignore: argument_type_not_assignable
final rr = Map<String, dynamic>.from(record); final rr = Map<String, String>.from(record);
records.add( records.add(
SrvRecord( SrvRecord(
rr['target']! as String, rr['target']!,
rr['port']! as int, rr['port']! as int,
rr['priority']! as int, rr['priority']! as int,
rr['weight']! as int, rr['weight']! as int,

View File

@ -1,8 +1,8 @@
name: moxdns_linux name: moxdns_linux
description: Linux-specific implementation of moxdns description: Linux-specific implementation of moxdns
version: 0.1.4+1 version: 0.1.2
homepage: https://codeberg.org/moxxy/moxdns homepage: https://codeberg.org/moxxy/moxdns
publish_to: https://git.polynom.me/api/packages/Moxxy/pub publish_to: https://pub.polynom.me
environment: environment:
sdk: ">=2.17.0-266.1.beta <3.0.0" sdk: ">=2.17.0-266.1.beta <3.0.0"
@ -13,13 +13,13 @@ dependencies:
sdk: flutter sdk: flutter
moxdns: moxdns:
hosted: https://git.polynom.me/api/packages/Moxxy/pub hosted: https://pub.polynom.me
version: 0.1.4+1 version: 0.1.2
moxdns_platform_interface: moxdns_platform_interface:
hosted: https://git.polynom.me/api/packages/Moxxy/pub hosted: https://pub.polynom.me
version: 0.1.4+1 version: 0.1.2
plugin_platform_interface: 2.1.2 plugin_platform_interface: 2.1.0
dev_dependencies: dev_dependencies:
flutter_lints: ^2.0.0 flutter_lints: ^2.0.0

View File

@ -1,7 +1,3 @@
## 0.1.4+1
- **REFACTOR**: Migrate to using melos.
## 0.1.0 ## 0.1.0
* Initial release * Initial release

View File

@ -1,8 +1,8 @@
name: moxdns_platform_interface name: moxdns_platform_interface
description: Platform definitions for moxdns description: Platform definitions for moxdns
homepage: https://codeberg.org/moxxy/moxdns homepage: https://codeberg.org/moxxy/moxdns
version: 0.1.4+1 version: 0.1.2
publish_to: https://git.polynom.me/api/packages/Moxxy/pub publish_to: https://pub.polynom.me
environment: environment:
sdk: ">=2.17.0-266.1.beta <3.0.0" sdk: ">=2.17.0-266.1.beta <3.0.0"
@ -12,7 +12,7 @@ dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
plugin_platform_interface: 2.1.2 plugin_platform_interface: 2.1.0
dev_dependencies: dev_dependencies:
flutter_lints: ^2.0.0 flutter_lints: ^2.0.0