Skip to content

Commit de49b36

Browse files
feat: add, test and verify macos-15, xcode-16.1 and swift-6.0.2 compatibility (#22)
* build(deps): bump swift 6.0.2 xcode 16.1 * ci(e2e-test): fix matrix syntax * ci(e2e-test): change back to swift-actions/[email protected] * ci(e2e-test): disable swift initialization if 6.0.2 * build(deps): bump pre swift 5.10 AppAuth dependency and update Package.resolved * fix(quickstart): correct project repo directory * refactor(quickstart): relative package dependency * refactor(quickstart): enable ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES * build: move SwiftLint to testTarget * ci(e2e-test): remove fusionauth-search * fix: update to latest xcode 16.2 and swift 6.0.3 * fix: downgrade to swift 6.0.2 - swift-actions/[email protected] Version "6.0.3" is not available * ci: update to macos-15 xcode 16.2 iOS-18.2 * ci: update to iPhone 16 * refactor(quickstart): revert enable ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES * ci: disable parallel testing * test: submit login form by `return` key instead of submit button * style: lint --------- Co-authored-by: Colin Frick <[email protected]>
1 parent ec4d263 commit de49b36

File tree

7 files changed

+37
-30
lines changed

7 files changed

+37
-30
lines changed

.github/workflows/codeql-package.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
#runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
2525
#runs-on: [ self-hosted, macos ]
26-
runs-on: [ 'macos-14' ]
26+
runs-on: [ 'macos-15' ]
2727

2828
#timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
2929
timeout-minutes: 120
@@ -43,11 +43,11 @@ jobs:
4343
fail-fast: false
4444
matrix:
4545
# https://github.com/swiftlang/swift/releases
46-
swift: [ "5.10.1" ]
46+
swift: ["6.0.2"]
4747
# https://developer.apple.com/documentation/xcode-release-notes
48-
xcode: [ "15.4" ]
49-
language: [ swift ]
50-
build-mode: [ manual ]
48+
xcode: ["16.2"]
49+
language: [swift]
50+
build-mode: [manual]
5151
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
5252
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
5353
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how

.github/workflows/codeql-samples-quickstart.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
#runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
2525
#runs-on: [ self-hosted, macos ]
26-
runs-on: [ 'macos-14' ]
26+
runs-on: [ 'macos-15' ]
2727

2828
#timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
2929
timeout-minutes: 120
@@ -43,13 +43,13 @@ jobs:
4343
fail-fast: false
4444
matrix:
4545
# https://github.com/swiftlang/swift/releases
46-
swift: [ "5.10.1" ]
46+
swift: [ "6.0.2" ]
4747
# https://developer.apple.com/documentation/xcode-release-notes
48-
xcode: [ "15.4" ]
48+
xcode: [ "16.2" ]
4949
language: [ swift ]
5050
build-mode: [ manual ]
5151
destination:
52-
- "platform=iOS Simulator,OS=18.1,name=iPhone 15"
52+
- "platform=iOS Simulator,OS=18.2,name=iPhone 16"
5353
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
5454
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
5555
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
@@ -115,7 +115,7 @@ jobs:
115115
116116
# Perform the build manually.
117117
- name: Manual Build
118-
run: set -o pipefail && xcodebuild -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native -destination "${{matrix.destination}}" -skipPackagePluginValidation
118+
run: set -o pipefail && xcodebuild -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native -destination "${{matrix.destination}}" -skipPackagePluginValidation -parallel-testing-enabled NO
119119

120120
# Perform CodeQL Analysis if the build succeeded or failed.
121121
- name: Perform CodeQL Analysis

.github/workflows/e2e-test-fusionauth-latest-ios-latest.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
destination: [ "platform=iOS Simulator,OS=18.1,name=iPhone 15" ]
40-
xcode: [ "15.4" ]
39+
destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 16" ]
40+
xcode: [ "16.2" ]
4141
simulator-platform: [ "iOS" ]
42-
simulator-version: [ "18.1" ]
43-
swift: [ "5.10.1" ]
44-
os: [ "macos-14" ]
42+
simulator-version: [ "18.2" ]
43+
swift: [ "6.0.2" ]
44+
os: [ "macos-15" ]
4545
postgresql-version: [ "16" ]
4646

4747
# Steps represent a sequence of tasks that will be executed as part of the job
@@ -184,7 +184,7 @@ jobs:
184184

185185
# Perform the tests from the fusionauth-quickstart-swift-ios-native Sample.
186186
- name: Perform end to end tests
187-
run: set -o pipefail && xcodebuild test -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native -destination "${{matrix.destination}}" -skipPackagePluginValidation
187+
run: set -o pipefail && xcodebuild test -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native -destination "${{matrix.destination}}" -skipPackagePluginValidation -parallel-testing-enabled NO
188188

189189
- name: Upload recording
190190
uses: actions/[email protected]

.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,21 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
destination: [ "platform=iOS Simulator,OS=18.1,name=iPhone 15" ]
40-
xcode: [ "15.4" ]
39+
destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 16" ]
40+
xcode: [ "16.2" ]
4141
simulator-platform: [ "iOS" ]
42-
simulator-version: [ "18.1" ]
43-
swift: [ "5.10.1" ]
44-
os: [ "macos-14" ]
42+
simulator-version: [ "18.2" ]
43+
swift: [ "6.0.2" ]
44+
os: [ "macos-15" ]
4545
postgresql-version: [ "16" ]
4646
include:
47+
- destination: "platform=iOS Simulator,OS=18.1,name=iPhone 15"
48+
xcode: "15.4"
49+
simulator-platform: "iOS"
50+
simulator-version: "18.1"
51+
swift: "5.10.1"
52+
os: "macos-14"
53+
postgresql-version: "16"
4754
- destination: "platform=iOS Simulator,OS=17.5,name=iPhone 15"
4855
xcode: "15.4"
4956
simulator-platform: "iOS"
@@ -206,7 +213,7 @@ jobs:
206213

207214
# Perform the tests from the fusionauth-quickstart-swift-ios-native Sample.
208215
- name: Perform end to end tests
209-
run: set -o pipefail && xcodebuild test -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native -destination "${{matrix.destination}}" -skipPackagePluginValidation
216+
run: set -o pipefail && xcodebuild test -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native -destination "${{matrix.destination}}" -skipPackagePluginValidation -parallel-testing-enabled NO
210217

211218
- name: Upload recording
212219
uses: actions/[email protected]

.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
destination: [ "platform=iOS Simulator,OS=18.1,name=iPhone 15" ]
35-
xcode: [ "15.4" ]
34+
destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 16" ]
35+
xcode: [ "16.2" ]
3636
simulator-platform: [ "iOS" ]
37-
simulator-version: [ "18.1" ]
38-
swift: [ "5.10.1" ]
39-
os: [ "macos-14" ]
37+
simulator-version: [ "18.2" ]
38+
swift: [ "6.0.2" ]
39+
os: [ "macos-15" ]
4040
postgresql-version: [ "16" ]
4141
fusionauth-docker-image-version: [ "1.51.2", "1.52.1", "1.53.3", "1.54.0", "1.55.1" ]
4242

@@ -180,7 +180,7 @@ jobs:
180180

181181
# Perform the tests from the fusionauth-quickstart-swift-ios-native Sample.
182182
- name: Perform end to end tests
183-
run: set -o pipefail && xcodebuild test -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native -destination "${{matrix.destination}}" -skipPackagePluginValidation
183+
run: set -o pipefail && xcodebuild test -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native -destination "${{matrix.destination}}" -skipPackagePluginValidation -parallel-testing-enabled NO
184184

185185
- name: Upload recording
186186
uses: actions/[email protected]

Samples/Quickstart/QuickstartTests/QuickstartTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ final class QuickstartTests: XCTestCase {
5757
passwordField.tap()
5858
passwordField.typeText("password")
5959

60-
submitButton.tap()
60+
passwordField.typeText("\n")
6161

6262
// Check that Welcome message is displayed
6363
let welcomeText = app.staticTexts["Welcome Richard Hendricks"]

Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
mainGroup = 0E2795EC2BD937B800738892;
213213
packageReferences = (
214214
0E5184912CD6279C004E2416 /* XCLocalSwiftPackageReference "../../../fusionauth-swift-sdk" */,
215-
);
215+
);
216216
productRefGroup = 0E2795F62BD937B800738892 /* Products */;
217217
projectDirPath = "";
218218
projectRoot = "";

0 commit comments

Comments
 (0)