👷 Slim apple artifacts

AstroxNetwork · Oct 27, 2023 · 3227490 · 3227490
1 parent 6010ce3
commit 3227490
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 52 deletions.
diff --git a/ios/Frameworks/AgentDart.xcframework/Info.plist b/ios/Frameworks/AgentDart.xcframework/Info.plist
@@ -4,19 +4,6 @@
 <dict>
 	<key>AvailableLibraries</key>
 	<array>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
-			<key>LibraryPath</key>
-			<string>libagent_dart.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>macos</string>
-		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64</string>

diff --git a/ios/Frameworks/AgentDart.xcframework/macos-arm64_x86_64/libagent_dart.a b/ios/Frameworks/AgentDart.xcframework/macos-arm64_x86_64/libagent_dart.a
diff --git a/macos/Frameworks/AgentDart.xcframework/Info.plist b/macos/Frameworks/AgentDart.xcframework/Info.plist
@@ -17,33 +17,6 @@
 			<key>SupportedPlatform</key>
 			<string>macos</string>
 		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
-			<key>LibraryPath</key>
-			<string>libagent_dart.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>libagent_dart.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
 	</array>
 	<key>CFBundlePackageType</key>
 	<string>XFWK</string>

diff --git a/macos/Frameworks/AgentDart.xcframework/ios-arm64/libagent_dart.a b/macos/Frameworks/AgentDart.xcframework/ios-arm64/libagent_dart.a
diff --git a/macos/Frameworks/AgentDart.xcframework/ios-arm64_x86_64-simulator/libagent_dart.a b/macos/Frameworks/AgentDart.xcframework/ios-arm64_x86_64-simulator/libagent_dart.a
diff --git a/scripts/build_apple.sh b/scripts/build_apple.sh
@@ -26,33 +26,39 @@ PLUGIN_NAME="AgentDartPlugin"
 FRAMEWORK="AgentDart.xcframework"
 LIB_NAME="libagent_dart.a"
 
-mkdir ios-lipo ios-sim-lipo mac-lipo
+mkdir ios-lipo ios-sim-lipo
 IOS_LIPO="ios-lipo/${LIB_NAME}"
 IOS_SIM_LIPO="ios-sim-lipo/${LIB_NAME}"
-MAC_LIPO="mac-lipo/${LIB_NAME}"
+IOS_FRAMEWORK="ios_${FRAMEWORK}"
 
 lipo -create -output $IOS_LIPO \
   "${TARGET_DIR}/aarch64-apple-ios/release/${LIB_NAME}"
 lipo -create -output $IOS_SIM_LIPO \
   "${TARGET_DIR}/aarch64-apple-ios-sim/release/${LIB_NAME}" \
   "${TARGET_DIR}/x86_64-apple-ios/release/${LIB_NAME}"
+xcodebuild -create-xcframework \
+  -library $IOS_LIPO \
+  -library $IOS_SIM_LIPO \
+  -output $IOS_FRAMEWORK
+zip -r $IOS_FRAMEWORK.zip $IOS_FRAMEWORK
+cp -f $IOS_FRAMEWORK.zip "../ios/Frameworks/${RELEASE_ARCHIVE_NAME}.zip"
+cp -r -f $IOS_FRAMEWORK ../ios/Frameworks
+
+mkdir mac-lipo
+MAC_LIPO="mac-lipo/${LIB_NAME}"
+MAC_FRAMEWORK="macos_${FRAMEWORK}"
 lipo -create -output $MAC_LIPO \
   "${TARGET_DIR}/aarch64-apple-darwin/release/${LIB_NAME}" \
   "${TARGET_DIR}/x86_64-apple-darwin/release/${LIB_NAME}"
 xcodebuild -create-xcframework \
-  -library $IOS_LIPO \
-  -library $IOS_SIM_LIPO \
   -library $MAC_LIPO \
-  -output $FRAMEWORK
-
-zip -r $FRAMEWORK.zip $FRAMEWORK
-cp -f $FRAMEWORK.zip "../ios/Frameworks/${RELEASE_ARCHIVE_NAME}.zip"
-cp -r -f $FRAMEWORK ../ios/Frameworks
-cp -f $FRAMEWORK.zip "../macos/Frameworks/${RELEASE_ARCHIVE_NAME}.zip"
-cp -r -f $FRAMEWORK ../macos/Frameworks
+  -output $MAC_FRAMEWORK
+zip -r $MAC_FRAMEWORK.zip $IOS_FRAMEWORK
+cp -f $MAC_FRAMEWORK.zip "../macos/Frameworks/${RELEASE_ARCHIVE_NAME}.zip"
+cp -r -f $MAC_FRAMEWORK ../macos/Frameworks
 
 # Cleanup
-rm -rf ios-lipo ios-sim-lipo mac-lipo $FRAMEWORK
+rm -rf ios-lipo ios-sim-lipo mac-lipo $IOS_FRAMEWORK $MAC_FRAMEWORK
 
 # Copy headers
 cd -