Merge branch 'release/0.3.10'

Author: yulingtianxia

dart_native/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.3.10
+
+* [Fix] Skip BOM for Utf-16 on iOS.
+
+## 0.3.9
+
+* [Fix] iOS framework compatibility.
+
 ## 0.3.8
 
 * [Feature] Android so file path.

dart_native/example/ios/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
-  - CocoaLumberjack (3.6.2):
-    - CocoaLumberjack/Core (= 3.6.2)
-  - CocoaLumberjack/Core (3.6.2)
+  - CocoaLumberjack (3.7.0):
+    - CocoaLumberjack/Core (= 3.7.0)
+  - CocoaLumberjack/Core (3.7.0)
   - dart_native (0.0.1):
     - Flutter
   - Flutter (1.0.0)
@@ -22,7 +22,7 @@ EXTERNAL SOURCES:
     :path: Flutter
 
 SPEC CHECKSUMS:
-  CocoaLumberjack: bd155f2dd06c0e0b03f876f7a3ee55693122ec94
+  CocoaLumberjack: e8955b9d337ac307103b0a34fd141c32f27e53c5
   dart_native: 8150ab93e4e060c19e0e8fb3bf98bc970d097957
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
 

dart_native/example/pubspec.lock

@@ -175,7 +175,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.3.8"
+    version: "0.3.10"
   dart_native_gen:
     dependency: transitive
     description:

dart_native/ios/Classes/native_runtime.h

@@ -66,7 +66,7 @@ _dispatch_get_main_queue(void);
 DN_EXTERN void
 native_mark_autoreleasereturn_object(id object);
 
-DN_EXTERN const void *
+DN_EXTERN const uint16_t *
 native_convert_nsstring_to_utf16(NSString *string, NSUInteger *length);
 
 #pragma mark - Dart VM API

dart_native/ios/Classes/native_runtime.mm

@@ -377,12 +377,16 @@
     }];
 }
 
-const void *
+const uint16_t *
 native_convert_nsstring_to_utf16(NSString *string, NSUInteger *length) {
     NSData *data = [string dataUsingEncoding:NSUTF16StringEncoding];
     // UTF16, 2-byte per unit
     *length = data.length / 2;
-    return data.bytes;
+    uint16_t *result = (uint16_t *)data.bytes;
+    if (*result == 0xFEFF || *result == 0xFFFE) { // skip BOM
+        result++;
+    }
+    return result;
 }
 
 #pragma mark Dart VM API Init

dart_native/ios/DartNative.framework/DartNative

@@ -384,7 +384,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -440,7 +440,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -464,6 +464,7 @@
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				INFOPLIST_FILE = DartNative/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -494,6 +495,7 @@
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				INFOPLIST_FILE = DartNative/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

dart_native/ios/DartNative.framework/Info.plist

@@ -14,10 +14,12 @@ Write native code using Dart. This package liberates you from native code and lo
   s.author           = { 'DartNative' => 'email@example.com' }
   s.source           = { :path => '.' }
   s.source_files = 'Classes/DartNativePlugin.*'
+#  s.source_files = 'Classes/**/*', 'libffi/*.h', 'common/**/*'
   s.public_header_files = 'Classes/DartNativePlugin.h'
   s.dependency 'Flutter'
   s.platform = :ios, '8.0'
   s.libraries = 'c++'
+#  s.vendored_libraries = 'libffi/libffi.a'
   s.vendored_frameworks = 'DartNative.framework'
   # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }

dart_native/ios/DartNative.xcodeproj/project.pbxproj

@@ -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.3.8
+version: 0.3.10
 homepage: https://github.com/dart-native/dart_native
 
 environment: