WIP

Author: davdroman

.github/workflows/ci.yml

@@ -29,45 +29,47 @@ jobs:
           - "6.0"
           - "6.1"
           - "6.2"
+        include:
+          - swift: "6.0"
+            xcode: "16.2"
+          - swift: "6.1"
+            xcode: "16.4"
+          - swift: "6.2"
+            xcode: "26.0"
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
 
+      - name: Load Simulator Lookup Tables
+        run: |
+          echo "SIMULATORS_JSON=$(jq -c . .github/workflows/xcode-simulators.json)" >> $GITHUB_ENV
+
       - name: Disable Macro Fingerprint Validation
         run: |
           defaults write com.apple.dt.Xcode IDESkipMacroFingerprintValidation -bool YES
           defaults write com.apple.dt.Xcode IDESkipPackagePluginFingerprintValidatation -bool YES
 
-      - if: matrix.swift == '6.2' && matrix.platform != 'mac-catalyst'
-        name: Select Xcode version
+      - if: matrix.platform != 'mac-catalyst'
+        name: Download Required Runtimes
         run: |
-          sudo xcodes select 26.0
-          xcodebuild -downloadPlatform ${{ matrix.runtime }}
+          sudo xcodes select ${{ matrix.xcode }}
+          xcodebuild -downloadPlatform ${{ matrix.platform }}
 
       - if: matrix.platform != 'mac-catalyst'
         name: Create Simulator
         run: |
-          sudo xcodes select 26.0
+          sudo xcodes select ${{ matrix.xcode }}
           xcrun simctl delete all
-          if [[ "${{ matrix.swift }}" == "6.2" ]]; then
-            if [[ "${{ matrix.platform }}" == "iOS" ]]; then
-              xcrun simctl create "CI iPhone 16 Pro" "com.apple.CoreSimulator.SimDeviceType.iPhone-16-Pro" "com.apple.CoreSimulator.SimRuntime.iOS-26-0"
-            else
-              xcrun simctl create "CI Apple TV 4K (3rd generation)" "com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-3rd-generation-4K" "com.apple.CoreSimulator.SimRuntime.tvOS-26-0"
-            fi
-          else
-            if [[ "${{ matrix.platform }}" == "iOS" ]]; then
-              xcrun simctl create "CI iPhone 15 Pro" "com.apple.CoreSimulator.SimDeviceType.iPhone-15-Pro" "com.apple.CoreSimulator.SimRuntime.iOS-18-6"
-            else
-              xcrun simctl create "CI Apple TV 4K (3rd generation)" "com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-3rd-generation-4K" "com.apple.CoreSimulator.SimRuntime.tvOS-18-5"
-            fi
-          fi
+          xcrun simctl create \
+            "${{ fromJSON(env.SIMULATORS_JSON)[matrix.platform].name }}" \
+            "${{ fromJSON(env.SIMULATORS_JSON)[matrix.platform].type }}" \
+            "${{ fromJSON(env.SIMULATORS_JSON)[matrix.platform].runtime }}"
 
       - name: Test Library
         uses: mxcl/xcodebuild@v3
         with:
           platform: ${{ matrix.platform }}
-          swift: ~${{ matrix.swift }}
+          xcode: ${{ matrix.xcode }}
           action: test
           workspace: SwiftUINavigationTransitions.xcworkspace
           scheme: SwiftUINavigationTransitions
@@ -76,7 +78,7 @@ jobs:
         uses: mxcl/xcodebuild@v3
         with:
           platform: ${{ matrix.platform }}
-          swift: ~${{ matrix.swift }}
+          xcode: ${{ matrix.xcode }}
           action: build
           workspace: SwiftUINavigationTransitions.xcworkspace
           scheme: Demo

.github/workflows/xcode-simulators.json

@@ -0,0 +1,44 @@
+{
+	"16.2": {
+		"iOS": {
+			"version": "18.2",
+			"name": "iPhone 15 Pro",
+			"type": "com.apple.CoreSimulator.SimDeviceType.iPhone-15-Pro",
+			"runtime": "com.apple.CoreSimulator.SimRuntime.iOS-18-2"
+		},
+		"tvOS": {
+			"version": "18.2",
+			"name": "Apple TV 4K (3rd generation)",
+			"type": "com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-3rd-generation-4K",
+			"runtime": "com.apple.CoreSimulator.SimRuntime.tvOS-18-2"
+		}
+	},
+	"16.4": {
+		"iOS": {
+			"version": "18.5",
+			"name": "iPhone 15 Pro",
+			"type": "com.apple.CoreSimulator.SimDeviceType.iPhone-15-Pro",
+			"runtime": "com.apple.CoreSimulator.SimRuntime.iOS-18-5"
+		},
+		"tvOS": {
+			"version": "18.5",
+			"name": "Apple TV 4K (3rd generation)",
+			"type": "com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-3rd-generation-4K",
+			"runtime": "com.apple.CoreSimulator.SimRuntime.tvOS-18-5"
+		}
+	},
+	"26.0": {
+		"iOS": {
+			"version": "26.0",
+			"name": "iPhone 16 Pro",
+			"type": "com.apple.CoreSimulator.SimDeviceType.iPhone-16-Pro",
+			"runtime": "com.apple.CoreSimulator.SimRuntime.iOS-26-0"
+		},
+		"tvOS": {
+			"version": "26.0",
+			"name": "Apple TV 4K (3rd generation)",
+			"type": "com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-3rd-generation-4K",
+			"runtime": "com.apple.CoreSimulator.SimRuntime.tvOS-26-0"
+		}
+	}
+}