🐛 m1 mac crash

niuhuan · Jan 15, 2024 · 8ce2cc0 · 8ce2cc0
1 parent 3c721fc
commit 8ce2cc0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -341,14 +341,11 @@ jobs:
               --class-name Native
           rustup target install x86_64-apple-darwin
           rustup target install aarch64-apple-darwin
-          cargo build --manifest-path native/Cargo.toml --release --target x86_64-apple-darwin
-          cargo build --manifest-path native/Cargo.toml --release --target aarch64-apple-darwin
           flutter config --enable-macos-desktop
           flutter build macos
           cd build
           mkdir appimage
           mv macos/Build/Products/Release/kobi.app appimage/
-          lipo -create -output appimage/kobi.app/Contents/Frameworks/libnative.dylib ../native/target/x86_64-apple-darwin/release/libnative.dylib ../native/target/aarch64-apple-darwin/release/libnative.dylib
           ln -sf /Applications appimage/
           hdiutil create -volname kobi -srcfolder appimage -ov -format UDBZ macos.dmg
           cd ..

diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -28,6 +28,7 @@
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
 		39DF1FD8C6BB292AEF60BABA /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A75F10C7796C538CDBB2D3B6 /* Pods_Runner.framework */; };
 		A3E7048127BD3F8900838FBB /* native.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A3E7047A27BD3F4D00838FBB /* native.dylib */; };
+		DDBDA93D2B54E3A50015F619 /* native.dylib in Bundle Framework */ = {isa = PBXBuildFile; fileRef = A3E7047A27BD3F4D00838FBB /* native.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -68,6 +69,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				DDBDA93D2B54E3A50015F619 /* native.dylib in Bundle Framework */,
 			);
 			name = "Bundle Framework";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -186,7 +188,6 @@
 				A4E109539B1A5155136EFF51 /* Pods-Runner.release.xcconfig */,
 				374667F87D968847B0F999D3 /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};

diff --git a/native/native.xcodeproj/xcuserdata/niuhuan.xcuserdatad/xcschemes/xcschememanagement.plist b/native/native.xcodeproj/xcuserdata/niuhuan.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
 		<key>native-cdylib.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>5</integer>
 		</dict>
 		<key>native-staticlib.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>4</integer>
 		</dict>
 	</dict>
 </dict>