Merge pull request #16 from algorandfoundation/ci/xcode_versions

ci(swift): fix iOS simulator version

.github/workflows/swift_ci.yml

@@ -41,10 +41,26 @@ jobs:
         with:
           targets: aarch64-apple-ios, x86_64-apple-ios, aarch64-apple-ios-sim, x86_64-apple-ios, aarch64-apple-ios-macabi, x86_64-apple-ios-macabi, aarch64-apple-darwin, x86_64-apple-darwin
       - uses: actions/setup-python@v5
-      - uses: mxcl/xcodebuild@v3
+      # - name: Cache Homebrew Bundler RubyGems
+      #   id: cache
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: ${{ steps.set-up-homebrew.outputs.gems-path }}
+      #     key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }}
+      #     restore-keys: ${{ runner.os }}-rubygems-
+      # - name: Install Homebrew Bundler RubyGems
+      #   if: steps.cache.outputs.cache-hit != 'true'
+      #   run: brew install-bundler-gems
+      # - name: Install brew packages
+      #   run: brew install aria2 xcodesorg/made/xcodes
+      - name: Setup Xcode
+        uses: mxcl/xcodebuild@v3
         with:
           swift: ^6
           action: none
+          platform: macOS
+      - name: Install iOS Simulator
+        run: xcodebuild -downloadPlatform iOS 
       - name: Build
         run: python -m dist.swift ${{ env.CRATE }}
       # Ideally we'd use a matrix for the platforms, but due to the limitations of Mac runners on GitHub it's probably better to just have a single job with multiple steps

dist/swift/AlgoModels/Frameworks/algo_models.xcframework/Info.plist

@@ -6,29 +6,32 @@
 	<array>
 		<dict>
 			<key>BinaryPath</key>
-			<string>libalgo_models_ffi.dylib</string>
+			<string>libalgo_models_ffi-catalyst.dylib</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
-			<string>libalgo_models_ffi.dylib</string>
+			<string>libalgo_models_ffi-catalyst.dylib</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
-			<string>libalgo_models_ffi-catalyst.dylib</string>
+			<string>libalgo_models_ffi-ios-sim.dylib</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-maccatalyst</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
-			<string>libalgo_models_ffi-catalyst.dylib</string>
+			<string>libalgo_models_ffi-ios-sim.dylib</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
@@ -37,43 +40,40 @@
 			<key>SupportedPlatform</key>
 			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
-			<string>libalgo_models_ffi-macos.dylib</string>
+			<string>libalgo_models_ffi.dylib</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
-			<string>libalgo_models_ffi-macos.dylib</string>
+			<string>libalgo_models_ffi.dylib</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
-			<string>libalgo_models_ffi-ios-sim.dylib</string>
+			<string>libalgo_models_ffi-macos.dylib</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
-			<string>libalgo_models_ffi-ios-sim.dylib</string>
+			<string>libalgo_models_ffi-macos.dylib</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>
+			<string>macos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>