Skip to content

Commit

Permalink
chore!: Bump Swift minimum version & bump simulators in CI (#755)
Browse files Browse the repository at this point in the history
* Bump 5.7 to 5.9

* Update simulator versions.

* Fix simulator version

---------

Co-authored-by: Sichan Yoo <chanyoo@amazon.com>
  • Loading branch information
sichanyoo and Sichan Yoo authored Jun 12, 2024
1 parent c142e87 commit 27a3724
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
- macos-13-xlarge
- macos-14-xlarge
xcode:
- Xcode_14.1
- Xcode_15.2
- Xcode_15.4
destination:
- 'platform=iOS Simulator,OS=16.1,name=iPhone 14'
- 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
- 'platform=iOS Simulator,OS=17.5,name=iPhone 15'
- 'platform=tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=OS X'
exclude:
Expand All @@ -36,17 +36,17 @@ jobs:
xcode: Xcode_15.4
# Don't run new macOS with old Xcode
- runner: macos-14-xlarge
xcode: Xcode_14.1
xcode: Xcode_15.2
# Don't run old iOS/tvOS simulator with new Xcode
- destination: 'platform=iOS Simulator,OS=16.1,name=iPhone 14'
- destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
xcode: Xcode_15.4
- destination: 'platform=tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)'
- destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
xcode: Xcode_15.4
# Don't run new iOS/tvOS simulator with old Xcode
- destination: 'platform=iOS Simulator,OS=17.5,name=iPhone 15'
xcode: Xcode_14.1
xcode: Xcode_15.2
- destination: 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)'
xcode: Xcode_14.1
xcode: Xcode_15.2
steps:
- name: Checkout smithy-swift
uses: actions/checkout@v4
Expand Down Expand Up @@ -123,8 +123,8 @@ jobs:
fail-fast: false
matrix:
swift:
- 5.7-amazonlinux2
- 5.7-focal
- 5.9-amazonlinux2
- 5.9-focal
- 5.10-amazonlinux2
- 5.10-jammy
container:
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.7
// swift-tools-version:5.9

import PackageDescription

Expand Down
2 changes: 1 addition & 1 deletion smithy-swift-codegen-test/smithy-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"gitRepo": "https://github.com/smithy-lang/smithy-swift.git",
"author": "Amazon Web Services",
"homepage": "https://docs.amplify.aws/",
"swiftVersion": "5.7.0",
"swiftVersion": "5.9.0",
"mergeModels": false
}
}
Expand Down

0 comments on commit 27a3724

Please sign in to comment.