fix: Fix error on Linux

- moxdns@0.1.4+1
 - moxdns_android@0.1.4+1
 - moxdns_linux@0.1.4+1
 - moxdns_platform_interface@0.1.4+1

.gitignore

@@ -27,6 +27,8 @@
 .dart_tool/
 .packages
 build/
+**/pubspec_overrides.yaml
 
+# NixOs
 .direnv
 .envrc

README.md

@@ -20,6 +20,14 @@ essentially does nothing right now.
 The function will return a future that either resolves to a list of SRV records, an empty
 list of no records were found or `null` if an error occured.
 
+## Contributing
+
+The development of this package is based on [melos](https://pub.dev/packages/melos).
+
+To make all packages link to each other locally, begin by running `melos bootstrap`. After editing
+the code and making your changes, please run `melos run analyze` to make sure that no linter warnings
+are left inside the code.
+
 ## License
 
 See `LICENSE`.

example/.metadata

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

example/android/app/build.gradle

@@ -44,7 +44,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "me.polynom.moxdns_example"
+        applicationId "com.example.example"
         // 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.
         minSdkVersion flutter.minSdkVersion

example/android/app/src/debug/AndroidManifest.xml

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

example/android/app/src/main/AndroidManifest.xml

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

example/android/app/src/main/kotlin/com/example/example/MainActivity.kt

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

example/android/app/src/profile/AndroidManifest.xml

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

example/android/gradle/wrapper/gradle-wrapper.properties

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

example/lib/main.dart

@@ -51,7 +51,9 @@ class MyHomePage extends StatefulWidget {
 
 class _MyHomePageState extends State<MyHomePage> {
   Future<void> _query() async {
+    print("Performing query...");
     final results = await MoxdnsPlugin.srvQuery("_xmpps-client._tcp.polynom.me", false);
+    print("Done");
     for (final r in results) {
       print("- Target: ${r.target}");
       print("  Port: ${r.port}");

example/linux/CMakeLists.txt

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

example/pubspec.lock

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

example/pubspec.yaml

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

flake.lock

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

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "moxlib";
   inputs = {
-    nixpkgs.url = "github:PapaTutuWawa/nixpkgs/nixos-unstable-flutter-2.13.0-0.1.pre";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
@@ -26,11 +26,11 @@
       useGoogleAPIs = false;
       useGoogleTVAddOns = false;
     };
-    pinnedJDK = pkgs.jdk11;
+    pinnedJDK = pkgs.jdk;
   in {
     devShell = pkgs.mkShell {
       buildInputs = with pkgs; [
-        flutterPackages.beta pinnedJDK android.platform-tools flutterPackages.dart-beta # Flutter
+        flutter pinnedJDK android.platform-tools dart # Flutter
 	      gitlint jq # Code hygiene
 	      ripgrep # General utilities
 
@@ -56,7 +56,7 @@
       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 ];
 
-      ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
+      ANDROID_HOME = (toString ./.) + "/.android/sdk";
       JAVA_HOME = pinnedJDK;
       ANDROID_AVD_HOME = (toString ./.) + "/.android/avd";
     };

melos.yaml

@@ -0,0 +1,12 @@
+name: moxdns
+packages:
+  - packages/**
+  - example/**
+
+command:
+  bootstrap:
+    usePubspecOverrides: true
+
+scripts:
+  analyze:
+    exec: dart analyze .

packages/moxdns/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.4+1
+
+ - **REFACTOR**: Migrate to using melos.
+
 ## 0.1.0
 
 * Initial release
@@ -5,3 +9,9 @@
 ## 0.1.1
 
 * Switch to selfhosted pub repository
+
+## 0.1.2
+
+* Fix crash when using moxdns while there is no Internet connection
+* Migrate to melos
+* Migrate to using `very_good_analysis` as a linting ruleset

packages/moxdns/pubspec.yaml

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

packages/moxdns_android/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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
 
 * Initial release
@@ -5,3 +11,9 @@
 ## 0.1.1
 
 * Switch to selfhosted pub repository
+
+## 0.1.2
+
+* Fix crash when using moxdns while there is no Internet connection
+* Migrate to melos
+* Migrate to using `very_good_analysis` as a linting ruleset

packages/moxdns_android/analysis_options.yaml

@@ -1,8 +1 @@
-include: package:very_good_analysis/analysis_options.yaml
-linter:
-  rules:
-    public_member_api_docs: false
-    lines_longer_than_80_chars: false
-    use_setters_to_change_properties: false
-    avoid_positional_boolean_parameters: false
-    avoid_bool_literals_in_conditional_expressions: false
+include: ../../analysis_options.yaml

packages/moxdns_android/android/src/main/java/me/polynom/moxdns_android/MoxdnsAndroidPlugin.java

@@ -56,9 +56,9 @@ public class MoxdnsAndroidPlugin implements FlutterPlugin, MethodCallHandler {
               }});
             }
             result.success(tmp);
-          } catch (IOException ex) {
+          } catch (Exception ex) {
             ex.printStackTrace();
-            result.error("1", ex.getMessage(), ex.getStackTrace());
+            result.success(new ArrayList());
           }
         }
       });

packages/moxdns_android/lib/moxdns_android.dart

@@ -24,7 +24,8 @@ class MoxdnsAndroidPlugin extends MoxdnsPlatform {
         if (record == null) {
           continue;
         }
-        final rr = Map<String, String>.from(record as Map<String, String>);
+        // ignore: argument_type_not_assignable
+        final rr = Map<String, String>.from(record);
         records.add(
           SrvRecord(
             rr['target']!,

packages/moxdns_android/pubspec.yaml

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

packages/moxdns_linux/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.4+1
+
+ - **REFACTOR**: Migrate to using melos.
+ - **FIX**: Crashing due to incorrect type casting.
+
 ## 0.1.0
 
 * Initial release
@@ -5,3 +10,9 @@
 ## 0.1.1
 
 * Switch to selfhosted pub repository
+
+## 0.1.2
+
+* Fix crash when using moxdns while there is no Internet connection
+* Migrate to melos
+* Migrate to using `very_good_analysis` as a linting ruleset

packages/moxdns_linux/analysis_options.yaml

@@ -1,8 +1 @@
-include: package:very_good_analysis/analysis_options.yaml
-linter:
-  rules:
-    public_member_api_docs: false
-    lines_longer_than_80_chars: false
-    use_setters_to_change_properties: false
-    avoid_positional_boolean_parameters: false
-    avoid_bool_literals_in_conditional_expressions: false
+include: ../../analysis_options.yaml

packages/moxdns_linux/lib/moxdns_linux.dart

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

packages/moxdns_linux/pubspec.yaml

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

packages/moxdns_platform_interface/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.4+1
+
+ - **REFACTOR**: Migrate to using melos.
+
 ## 0.1.0
 
 * Initial release
@@ -5,3 +9,9 @@
 ## 0.1.1
 
 * Switch to selfhosted pub repository
+
+## 0.1.2
+
+* Fix crash when using moxdns while there is no Internet connection
+* Migrate to melos
+* Migrate to using `very_good_analysis` as a linting ruleset

packages/moxdns_platform_interface/analysis_options.yaml

@@ -1,8 +1 @@
-include: package:very_good_analysis/analysis_options.yaml
-linter:
-  rules:
-    public_member_api_docs: false
-    lines_longer_than_80_chars: false
-    use_setters_to_change_properties: false
-    avoid_positional_boolean_parameters: false
-    avoid_bool_literals_in_conditional_expressions: false
+include: ../../analysis_options.yaml

packages/moxdns_platform_interface/pubspec.yaml

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