.gitignore

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

melos.yaml

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

packages/moxdns/CHANGELOG.md

@@ -5,9 +5,3 @@
 ## 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/README.md

@@ -20,14 +20,6 @@ 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`.

packages/moxdns/example/lib/main.dart

@@ -51,9 +51,7 @@ 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}");

packages/moxdns/example/pubspec.lock

@@ -105,31 +105,31 @@ packages:
   moxdns:
     dependency: "direct main"
     description:
-      path: "../packages/moxdns"
+      path: ".."
       relative: true
     source: path
-    version: "0.1.1"
+    version: "0.1.0"
   moxdns_android:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "../packages/moxdns_android"
+      path: "../../moxdns_android"
       relative: true
     source: path
-    version: "0.1.1"
+    version: "0.1.0"
   moxdns_linux:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "../packages/moxdns_linux"
+      path: "../../moxdns_linux"
       relative: true
     source: path
-    version: "0.1.1"
+    version: "0.1.0"
   moxdns_platform_interface:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "../packages/moxdns_platform_interface"
+      path: "../../moxdns_platform_interface"
       relative: true
     source: path
-    version: "0.1.1"
+    version: "0.1.0"
   path:
     dependency: transitive
     description:
@@ -200,3 +200,4 @@ packages:
     version: "2.1.2"
 sdks:
   dart: ">=2.17.0-266.1.beta <3.0.0"
+  flutter: ">=2.5.0"

packages/moxdns/example/pubspec.yaml

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

packages/moxdns/pubspec.yaml

@@ -1,6 +1,6 @@
 name: moxdns
 description: A simple wrapper over platform native DNS methods
-version: 0.1.2
+version: 0.1.1
 homepage: https://codeberg.org/moxxy/moxdns
 publish_to: https://pub.polynom.me
 
@@ -22,13 +22,13 @@ dependencies:
 
   moxdns_android:
     hosted: https://pub.polynom.me
-    version: 0.1.2
+    version: 0.1.1
   moxdns_linux:
     hosted: https://pub.polynom.me
-    version: 0.1.2
+    version: 0.1.1
   moxdns_platform_interface:
     hosted: https://pub.polynom.me
-    version: 0.1.2
+    version: 0.1.1
 
 dev_dependencies:
   flutter_lints: ^2.0.0

packages/moxdns_android/CHANGELOG.md

@@ -5,9 +5,3 @@
 ## 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 +1,8 @@
-include: ../../analysis_options.yaml
+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

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 (Exception ex) {
+          } catch (IOException ex) {
             ex.printStackTrace();
-            result.success(new ArrayList());
+            result.error("1", ex.getMessage(), ex.getStackTrace());
           }
         }
       });

packages/moxdns_android/lib/moxdns_android.dart

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

packages/moxdns_android/pubspec.yaml

@@ -1,6 +1,6 @@
 name: moxdns_android
 description: Android-specific implementation of moxdns
-version: 0.1.2
+version: 0.1.1
 homepage: https://codeberg.org/moxxy/moxdns
 publish_to: https://pub.polynom.me
 
@@ -14,10 +14,10 @@ dependencies:
 
   moxdns:
     hosted: https://pub.polynom.me
-    version: 0.1.2
+    version: 0.1.1
   moxdns_platform_interface:
     hosted: https://pub.polynom.me
-    version: 0.1.2
+    version: 0.1.1
 
   plugin_platform_interface: 2.1.0
 

packages/moxdns_linux/CHANGELOG.md

@@ -5,9 +5,3 @@
 ## 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 +1,8 @@
-include: ../../analysis_options.yaml
+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

packages/moxdns_linux/lib/moxdns_linux.dart

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

packages/moxdns_linux/pubspec.yaml

@@ -1,6 +1,6 @@
 name: moxdns_linux
 description: Linux-specific implementation of moxdns
-version: 0.1.2
+version: 0.1.1
 homepage: https://codeberg.org/moxxy/moxdns
 publish_to: https://pub.polynom.me
 
@@ -14,10 +14,10 @@ dependencies:
 
   moxdns:
     hosted: https://pub.polynom.me
-    version: 0.1.2
+    version: 0.1.1
   moxdns_platform_interface:
     hosted: https://pub.polynom.me
-    version: 0.1.2
+    version: 0.1.1
 
   plugin_platform_interface: 2.1.0
 

packages/moxdns_platform_interface/CHANGELOG.md

@@ -5,9 +5,3 @@
 ## 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 +1,8 @@
-include: ../../analysis_options.yaml
+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

packages/moxdns_platform_interface/pubspec.yaml

@@ -1,7 +1,7 @@
 name: moxdns_platform_interface
 description: Platform definitions for moxdns
 homepage: https://codeberg.org/moxxy/moxdns
-version: 0.1.2
+version: 0.1.1
 publish_to: https://pub.polynom.me
 
 environment: