fix: Fix error on Linux

2022-11-08 17:43:39 +01:00 · 2022-11-08 17:43:39 +01:00 · 44117c4da7
commit 44117c4da7
parent a1f01486fe
12 changed files with 45 additions and 50 deletions
--- a/example/.metadata
+++ b/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

--- a/example/android/app/build.gradle
+++ b/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
--- a/example/android/app/src/debug/AndroidManifest.xml
+++ b/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.
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/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
--- a/example/android/app/src/main/kotlin/me/polynom/moxdns_example/MainActivity.kt
+++ b/example/android/app/src/main/kotlin/me/polynom/moxdns_example/MainActivity.kt
@ -1,4 +1,4 @@
-package me.polynom.moxdns_example
+package com.example.example

 import io.flutter.embedding.android.FlutterActivity

--- a/example/android/app/src/profile/AndroidManifest.xml
+++ b/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.
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/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
--- a/example/linux/CMakeLists.txt
+++ b/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.
--- a/example/pubspec.lock
+++ b/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: "../packages/moxdns"
      relative: true
    source: path
-    version: "0.1.1"
+    version: "0.1.4"
  moxdns_android:
    dependency: "direct overridden"
    description:
      path: "../packages/moxdns_android"
      relative: true
    source: path
-    version: "0.1.1"
+    version: "0.1.4"
  moxdns_linux:
    dependency: "direct overridden"
    description:
      path: "../packages/moxdns_linux"
      relative: true
    source: path
-    version: "0.1.1"
+    version: "0.1.4"
  moxdns_platform_interface:
    dependency: "direct overridden"
    description:
      path: "../packages/moxdns_platform_interface"
      relative: true
    source: path
-    version: "0.1.1"
+    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:
--- a/flake.lock
+++ b/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"
      }
--- a/flake.nix
+++ b/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";
    };
--- a/packages/moxdns_linux/lib/moxdns_linux.dart
+++ b/packages/moxdns_linux/lib/moxdns_linux.dart
@ -27,10 +27,10 @@ class MoxdnsLinuxPlugin extends MoxdnsPlatform {
          continue;
        }
        // ignore: argument_type_not_assignable
-        final rr = Map<String, String>.from(record);
+        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,