Merge branch 'release/0.3.14'

Author: yulingtianxia

.github/workflows/dart.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           # same with pubspec.yaml
-          flutter-version: "1.20.2"
+          flutter-version: "1.22.3"
       - run: flutter pub get
         working-directory: dart_native
       - run: flutter test --no-pub test/

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           # same with pubspec.yaml
-          flutter-version: "1.20.2"
+          flutter-version: "1.22.3"
       - run: flutter pub get
         working-directory: dart_native/example
       - run: flutter analyze --no-pub --no-current-package lib/ test/

dart_native/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.14
+
+* [Feature] Support `await/async` for methods on iOS.
+
 ## 0.3.13
 
 * [Fix] Memory leaks on Android.

dart_native/example/ios/Podfile.lock

@@ -23,7 +23,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   CocoaLumberjack: e8955b9d337ac307103b0a34fd141c32f27e53c5
-  dart_native: 8150ab93e4e060c19e0e8fb3bf98bc970d097957
+  dart_native: e10848b23206739fc16a2455f41847418a8ceb3d
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
 
 PODFILE CHECKSUM: f10e42e188a012076f9d5e111f499229a501832a

dart_native/example/ios/Runner.xcodeproj/project.pbxproj

@@ -159,7 +159,7 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				BE5B22DFAAC4C980EE6298D0 /* [CP] Embed Pods Frameworks */,
+				3199B333F30D678225AFDF10 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -240,53 +240,53 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+		3199B333F30D678225AFDF10 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${PODS_ROOT}/../Flutter/Flutter.framework",
+				"${PODS_ROOT}/../.symlinks/plugins/dart_native/ios/DartNative.framework",
 			);
-			name = "Thin Binary";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DartNative.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Run Script";
+			name = "Thin Binary";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
 		};
-		BE5B22DFAAC4C980EE6298D0 /* [CP] Embed Pods Frameworks */ = {
+		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../Flutter/Flutter.framework",
-				"${PODS_ROOT}/../.symlinks/plugins/dart_native/ios/DartNative.framework",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			name = "Run Script";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DartNative.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

dart_native/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -59,6 +59,13 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <AdditionalOptions>
+         <AdditionalOption
+            key = "NSZombieEnabled"
+            value = "YES"
+            isEnabled = "YES">
+         </AdditionalOption>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"

dart_native/example/ios/Runner/RuntimeStub.m

@@ -257,7 +257,7 @@ - (void)fooStructDelegate:(id<SampleDelegate>)delegate {
 }
 
 - (NSString *)fooNSString:(NSString *)str {
-    DDLogInfo(@"%s arg: %@", __FUNCTION__, str);
+//    DDLogInfo(@"%s arg: %@", __FUNCTION__, str);
     return @"test nsstring";
 }
 

dart_native/example/lib/ios/ios_main.dart

@@ -36,7 +36,6 @@ class _IOSAppState extends State<IOSApp> {
     print(
         "Flutter Channel Cost: ${DateTime.now().millisecondsSinceEpoch - time}");
     time = DateTime.now().millisecondsSinceEpoch;
-
     for (var i = 0; i < 10000; i++) {
       String _ = stub.fooNSString(testString);
     }

dart_native/example/lib/ios/runtimestub.dart

@@ -249,6 +249,12 @@ class RuntimeStub extends NSObject {
     return NSString.fromPointer(result).raw;
   }
 
+  Future<dynamic> fooNSStringAsync(String str) async {
+    return performAsync(SEL('fooNSString:'), args: [str]).then((value) {
+      return NSString.fromPointer(value.pointer).raw;
+    });
+  }
+
   String fooNSMutableString(String str) {
     NSMutableString _str = NSMutableString(str);
     Pointer<Void> result =

dart_native/example/lib/ios/unit_test.dart

@@ -143,11 +143,13 @@ testIOS(RuntimeStub stub, DelegateStub delegate) {
       stub.fooWithOptions(TestOptions(TestOptionsOne | TestOptionsTwo));
   print('fooWithOptions result:$options');
 
-  NSObject currentThread = Class('NSThread')
-      .perform(SEL('currentThread'), onQueue: DispatchQueue.global());
-  NSObject description = currentThread.perform(SEL('description'));
-  String threadResult = NSString.fromPointer(description.pointer).raw;
-  print('currentThread: $threadResult');
+  Class('NSThread')
+      .performAsync(SEL('currentThread'), onQueue: DispatchQueue.global())
+      .then((currentThread) {
+    NSObject description = currentThread.perform(SEL('description'));
+    String threadResult = NSString.fromPointer(description.pointer).raw;
+    print('currentThread: $threadResult');
+  });
 
   NSNotificationCenter.defaultCenter.addObserver(
       delegate, delegate.handleNotification, 'SampleDartNotification', nil);