Merge branch 'release/0.6.6'

dart_native/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.6
+
+* [Fix] Dependency verison compatible.
+
 ## 0.6.5
 
 * [Fix] Fix utf16 issue on iOS.

dart_native/example/pubspec.lock

@@ -168,14 +168,14 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.6.5"
+    version: "0.6.6"
   dart_native_gen:
     dependency: transitive
     description:
       name: dart_native_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.3.1"
   dart_style:
     dependency: transitive
     description:

dart_native/pubspec.lock

@@ -161,7 +161,7 @@ packages:
       name: dart_native_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.3.1"
   dart_style:
     dependency: transitive
     description:

dart_native/pubspec.yaml

@@ -1,6 +1,6 @@
 name: dart_native
 description: Write native code using Dart. This package liberates you from native code and low performance channel.
-version: 0.6.5
+version: 0.6.6
 homepage: https://github.com/dart-native/dart_native
 
 environment:
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   ffi: ^1.0.0
-  dart_native_gen: ^0.3.0
+  dart_native_gen: ^0.3.2
 
 dev_dependencies:
   flutter_test:

dart_native_gen/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.3.2] - Dependency verison compatible.
+
+## [0.3.1] - Fix the generated import code.
+
 ## [0.3.0] - Support className for Java.
 
 ## [0.2.0] - Upgrade to Flutter 2.

dart_native_gen/example/pubspec.lock

@@ -168,14 +168,14 @@ packages:
       path: "../../dart_native"
       relative: true
     source: path
-    version: "0.5.0"
+    version: "0.6.6"
   dart_native_gen:
     dependency: transitive
     description:
       name: dart_native_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.3.1"
   dart_style:
     dependency: transitive
     description:
@@ -284,6 +284,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -421,7 +428,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   timing:
     dependency: transitive
     description:

dart_native_gen/lib/src/writer.dart

@@ -24,19 +24,20 @@ class Writer {
     }
 
     String result = "import 'package:dart_native/dart_native.dart';";
-    Set<String> importFiles = type == ClassType.Java
-        ? collector.javaImportFiles
-        : collector.ocImportFiles;
-    result += importFiles.map((String importFile) {
-      return "import '$importFile';";
-    }).join('\n');
 
     if (Collector.packageName == 'dart_native') {
       result += """
         bool _hadRanDartNative = false;
         bool get hadRanDartNative => _hadRanDartNative;
 
         """;
+    } else {
+      Set<String> importFiles = type == ClassType.Java
+          ? collector.javaImportFiles
+          : collector.ocImportFiles;
+      result += importFiles.map((String importFile) {
+        return "import '$importFile';";
+      }).join('\n');
     }
 
     String functionName =

dart_native_gen/pubspec.lock

@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "22.0.0"
+    version: "31.0.0"
   analyzer:
     dependency: "direct main"
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.2"
+    version: "2.8.0"
   args:
     dependency: transitive
     description:
@@ -42,7 +42,7 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.3.0"
   build_config:
     dependency: transitive
     description:
@@ -56,28 +56,28 @@ packages:
       name: build_daemon
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.0"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.6"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.1.10"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.0.0"
+    version: "7.2.2"
   built_collection:
     dependency: transitive
     description:
@@ -161,7 +161,7 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.2.1"
   fake_async:
     dependency: transitive
     description:
@@ -248,7 +248,7 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.1"
+    version: "4.4.0"
   logging:
     dependency: transitive
     description:
@@ -263,6 +263,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -344,7 +351,7 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.2.2"
   source_span:
     dependency: transitive
     description:
@@ -393,7 +400,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   timing:
     dependency: transitive
     description:

dart_native_gen/pubspec.yaml

@@ -1,6 +1,6 @@
 name: dart_native_gen
 description: Automatic type conversion solution for dart_native based on source_gen through annotation.
-version: 0.3.0
+version: 0.3.2
 homepage: https://github.com/dart-native/dart_native/
 
 environment:
@@ -11,7 +11,7 @@ dependencies:
     sdk: flutter
   source_gen: ^1.0.2
   build: ^2.0.2
-  analyzer: ^1.7.1
+  analyzer: '>=1.7.1 <4.0.0'
 
 dev_dependencies:
   flutter_test: