Merge remote-tracking branch 'origin/main' into jbe/spr2

smithy-lang · Nov 1, 2024 · 78e992a · 78e992a
2 parents afa6e08 + 0d4d3ea
commit 78e992a
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 28 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -17,39 +17,52 @@ jobs:
       matrix:
         # This matrix runs tests on iOS sim & Mac, on oldest & newest supported Xcodes
         runner:
-          - macos-13
+          - macos-14
           - macos-15
         xcode:
           - Xcode_15.2
-          - Xcode_16
+          - Xcode_16.1
         destination:
           - 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
-          - 'platform=iOS Simulator,OS=18.0,name=iPhone 16'
+          - 'platform=iOS Simulator,OS=18.1,name=iPhone 16'
           - 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
-          - 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)'
+          - 'platform=tvOS Simulator,OS=18.1,name=Apple TV 4K (3rd generation) (at 1080p)'
+          - 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
+          - 'platform=visionOS Simulator,OS=2.1,name=Apple Vision Pro'
           - 'platform=macOS'
         exclude:
           # Don't run old macOS with new Xcode
-          - runner: macos-13
-            xcode: Xcode_16
+          - runner: macos-14
+            xcode: Xcode_16.1
           # Don't run new macOS with old Xcode
           - runner: macos-15
             xcode: Xcode_15.2
-          # Don't run old iOS/tvOS simulator with new Xcode
-          - destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
-            xcode: Xcode_16
+          # Don't run old simulators with new Xcode
           - destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
-            xcode: Xcode_16
-          # Don't run new iOS/tvOS simulator with old Xcode
-          - destination: 'platform=iOS Simulator,OS=18.0,name=iPhone 16'
+            xcode: Xcode_16.1
+          - destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
+            xcode: Xcode_16.1
+          - destination: 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
+            xcode: Xcode_16.1
+          # Don't run new simulators with old Xcode
+          - destination: 'platform=tvOS Simulator,OS=18.1,name=Apple TV 4K (3rd generation) (at 1080p)'
             xcode: Xcode_15.2
-          - destination: 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)'
+          - destination: 'platform=iOS Simulator,OS=18.1,name=iPhone 16'
+            xcode: Xcode_15.2
+          - destination: 'platform=visionOS Simulator,OS=2.1,name=Apple Vision Pro'
             xcode: Xcode_15.2
     steps:
       - name: Configure Xcode
         run: |
           sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
           xcode-select -p
+      - name: Install visionOS sim if needed
+        if: ${{ contains(matrix.destination, 'platform=visionOS') }}
+        run: |
+          sudo xcodebuild -runFirstLaunch
+          sudo xcrun simctl list
+          sudo xcodebuild -downloadPlatform visionOS
+          sudo xcodebuild -runFirstLaunch
       - name: Checkout smithy-swift
         uses: actions/checkout@v4
       - name: Cache Gradle
@@ -96,39 +109,52 @@ jobs:
       matrix:
         # This matrix runs tests on iOS sim & Mac, on oldest & newest supported Xcodes
         runner:
-          - macos-13
+          - macos-14
           - macos-15
         xcode:
           - Xcode_15.2
-          - Xcode_16
+          - Xcode_16.1
         destination:
           - 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
-          - 'platform=iOS Simulator,OS=18.0,name=iPhone 16'
+          - 'platform=iOS Simulator,OS=18.1,name=iPhone 16'
           - 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
-          - 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)'
+          - 'platform=tvOS Simulator,OS=18.1,name=Apple TV 4K (3rd generation) (at 1080p)'
+          - 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
+          - 'platform=visionOS Simulator,OS=2.1,name=Apple Vision Pro'
           - 'platform=macOS'
         exclude:
           # Don't run old macOS with new Xcode
-          - runner: macos-13
-            xcode: Xcode_16
+          - runner: macos-14
+            xcode: Xcode_16.1
           # Don't run new macOS with old Xcode
           - runner: macos-15
             xcode: Xcode_15.2
-          # Don't run old iOS/tvOS simulator with new Xcode
-          - destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
-            xcode: Xcode_16
+          # Don't run old simulators with new Xcode
           - destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
-            xcode: Xcode_16
-          # Don't run new iOS/tvOS simulator with old Xcode
-          - destination: 'platform=iOS Simulator,OS=18.0,name=iPhone 16'
+            xcode: Xcode_16.1
+          - destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
+            xcode: Xcode_16.1
+          - destination: 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
+            xcode: Xcode_16.1
+          # Don't run new simulators with old Xcode
+          - destination: 'platform=tvOS Simulator,OS=18.1,name=Apple TV 4K (3rd generation) (at 1080p)'
             xcode: Xcode_15.2
-          - destination: 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)'
+          - destination: 'platform=iOS Simulator,OS=18.1,name=iPhone 16'
+            xcode: Xcode_15.2
+          - destination: 'platform=visionOS Simulator,OS=2.1,name=Apple Vision Pro'
             xcode: Xcode_15.2
     steps:
       - name: Configure Xcode
         run: |
           sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
           xcode-select -p
+      - name: Install visionOS sim if needed
+        if: ${{ contains(matrix.destination, 'platform=visionOS') }}
+        run: |
+          sudo xcodebuild -runFirstLaunch
+          sudo xcrun simctl list
+          sudo xcodebuild -downloadPlatform visionOS
+          sudo xcodebuild -runFirstLaunch
       - name: Checkout smithy-swift
         uses: actions/checkout@v4
       - name: Select aws-sdk-swift branch

diff --git a/Package.version b/Package.version
@@ -1 +1 @@
-0.86.0
+0.87.0
diff --git a/Package.version.next b/Package.version.next
@@ -1 +1 @@
-0.87.0
+0.88.0