fix: utf16 decode.

Author: yulingtianxia

dart_native/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.11
+
+* [Fix] Skip BOM for Utf-16 on iOS. Sad!
+
 ## 0.3.10
 
 * [Fix] Skip BOM for Utf-16 on iOS.

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

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0CA3C332D4A04FA0AF3B4CF1 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 55A10DA5FB56EED2F91A32C5 /* libPods-Runner.a */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
@@ -16,7 +17,6 @@
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
 		A41207A1242B949F001B3E1C /* RuntimeSon.m in Sources */ = {isa = PBXBuildFile; fileRef = A41207A0242B949F001B3E1C /* RuntimeSon.m */; };
 		A462C31623C83CEB00068880 /* RuntimeStub.m in Sources */ = {isa = PBXBuildFile; fileRef = A462C31523C83CEA00068880 /* RuntimeStub.m */; };
-		A99EDC3FB62BC44FF3AF35C3 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0146B48A4BA9D6861E0085B8 /* libPods-Runner.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -33,11 +33,11 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0146B48A4BA9D6861E0085B8 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		2A4AF18FDF40A3D2129339D3 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		55A10DA5FB56EED2F91A32C5 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -62,7 +62,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A99EDC3FB62BC44FF3AF35C3 /* libPods-Runner.a in Frameworks */,
+				0CA3C332D4A04FA0AF3B4CF1 /* libPods-Runner.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -72,7 +72,7 @@
 		4C2E40D2EBC79D4E31BCF1AA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				0146B48A4BA9D6861E0085B8 /* libPods-Runner.a */,
+				55A10DA5FB56EED2F91A32C5 /* libPods-Runner.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";

dart_native/example/pubspec.lock

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

dart_native/ios/Classes/native_runtime.mm

@@ -385,6 +385,7 @@
     uint16_t *result = (uint16_t *)data.bytes;
     if (*result == 0xFEFF || *result == 0xFFFE) { // skip BOM
         result++;
+        *length = *length - 1;
     }
     return result;
 }

dart_native/ios/DartNative.framework/DartNative

@@ -13,14 +13,18 @@ Write native code using Dart. This package liberates you from native code and lo
   s.license          = { :file => '../LICENSE' }
   s.author           = { 'DartNative' => 'email@example.com' }
   s.source           = { :path => '.' }
-  s.source_files = 'Classes/DartNativePlugin.*'
+  
 #  s.source_files = 'Classes/**/*', 'libffi/*.h', 'common/**/*'
+  s.source_files = 'Classes/DartNativePlugin.*'
+  
   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' }
 end

dart_native/ios/DartNative/Info.plist

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