Skip to content

feat: add, test and verify macos-15, xcode-16.1 and swift-6.0.2 compatibility #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Feb 5, 2025
Merged

feat: add, test and verify macos-15, xcode-16.1 and swift-6.0.2 compatibility #22

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4f0821a
build(deps): bump swift 6.0.2 xcode 16.1
Aaron-Ritter Nov 30, 2024
d45a21b
ci(e2e-test): fix matrix syntax
Aaron-Ritter Nov 30, 2024
a029990
ci(e2e-test): change back to swift-actions/[email protected]
Aaron-Ritter Nov 30, 2024
39d8007
ci(e2e-test): disable swift initialization if 6.0.2
Aaron-Ritter Nov 30, 2024
2c61538
build(deps): bump pre swift 5.10 AppAuth dependency and update Packag…
Aaron-Ritter Dec 7, 2024
c938b2e
fix(quickstart): correct project repo directory
Aaron-Ritter Dec 9, 2024
49cc60e
refactor(quickstart): relative package dependency
Aaron-Ritter Dec 9, 2024
9629e3d
refactor(quickstart): enable ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES
Aaron-Ritter Dec 9, 2024
5b7078b
Merge branch 'main' into swift-6.0.2
Aaron-Ritter Dec 9, 2024
b256e46
Merge remote-tracking branch 'origin/main' into swift-6.0.2
Aaron-Ritter Dec 9, 2024
d8573f6
build: move SwiftLint to testTarget
ColinFrick Dec 9, 2024
94d7e0c
Merge remote-tracking branch 'origin/main' into swift-6.0.2
Aaron-Ritter Dec 9, 2024
67b87e2
ci(e2e-test): remove fusionauth-search
Aaron-Ritter Dec 11, 2024
79f3432
Merge remote-tracking branch 'origin/main' into swift-6.0.2
Aaron-Ritter Dec 11, 2024
66f71d5
Merge branch 'main' into swift-6.0.2
Aaron-Ritter Jan 14, 2025
b6bd330
Merge branch 'main' into swift-6.0.2
Aaron-Ritter Jan 17, 2025
f08274c
Merge remote-tracking branch 'origin/main' into swift-6.0.2
Aaron-Ritter Jan 18, 2025
e173089
fix: update to latest xcode 16.2 and swift 6.0.3
Aaron-Ritter Jan 18, 2025
f3d515e
fix: downgrade to swift 6.0.2
Aaron-Ritter Jan 18, 2025
e58a16c
ci: update to macos-15 xcode 16.2 iOS-18.2
Aaron-Ritter Jan 21, 2025
f734d4a
ci: update to iPhone 16
Aaron-Ritter Jan 21, 2025
b8027d3
refactor(quickstart): revert enable ALWAYS_EMBED_SWIFT_STANDARD_LIBRA…
Aaron-Ritter Jan 21, 2025
56f1d16
ci: disable parallel testing
ColinFrick Feb 5, 2025
8f2dde3
test: submit login form by `return` key instead of submit button
ColinFrick Feb 5, 2025
34e9ccf
style: lint
ColinFrick Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/codeql-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

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

#timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
timeout-minutes: 120
Expand All @@ -41,11 +41,11 @@ jobs:
fail-fast: false
matrix:
# https://github.com/swiftlang/swift/releases
swift: [ "5.10.1" ]
swift: ["6.0.2"]
# https://developer.apple.com/documentation/xcode-release-notes
xcode: [ "15.4" ]
language: [ swift ]
build-mode: [ manual ]
xcode: ["16.2"]
language: [swift]
build-mode: [manual]
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/codeql-samples-quickstart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

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

#timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
timeout-minutes: 120
Expand All @@ -41,13 +41,13 @@ jobs:
fail-fast: false
matrix:
# https://github.com/swiftlang/swift/releases
swift: [ "5.10.1" ]
swift: [ "6.0.2" ]
# https://developer.apple.com/documentation/xcode-release-notes
xcode: [ "15.4" ]
xcode: [ "16.2" ]
language: [ swift ]
build-mode: [ manual ]
destination:
- "platform=iOS Simulator,OS=18.1,name=iPhone 15"
- "platform=iOS Simulator,OS=18.2,name=iPhone 16"
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:

# Perform the build manually.
- name: Manual Build
run: set -o pipefail && xcodebuild -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native -destination "${{matrix.destination}}" -skipPackagePluginValidation
run: set -o pipefail && xcodebuild -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native -destination "${{matrix.destination}}" -skipPackagePluginValidation -parallel-testing-enabled NO

# Perform CodeQL Analysis if the build succeeded or failed.
- name: Perform CodeQL Analysis
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/e2e-test-fusionauth-latest-ios-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ jobs:
strategy:
fail-fast: false
matrix:
destination: [ "platform=iOS Simulator,OS=18.1,name=iPhone 15" ]
xcode: [ "15.4" ]
destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 16" ]
xcode: [ "16.2" ]
simulator-platform: [ "iOS" ]
simulator-version: [ "18.1" ]
swift: [ "5.10.1" ]
os: [ "macos-14" ]
simulator-version: [ "18.2" ]
swift: [ "6.0.2" ]
os: [ "macos-15" ]
postgresql-version: [ "16" ]

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

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

- name: Upload recording
uses: actions/[email protected]
Expand Down
19 changes: 13 additions & 6 deletions .github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,21 @@ jobs:
strategy:
fail-fast: false
matrix:
destination: [ "platform=iOS Simulator,OS=18.1,name=iPhone 15" ]
xcode: [ "15.4" ]
destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 16" ]
xcode: [ "16.2" ]
simulator-platform: [ "iOS" ]
simulator-version: [ "18.1" ]
swift: [ "5.10.1" ]
os: [ "macos-14" ]
simulator-version: [ "18.2" ]
swift: [ "6.0.2" ]
os: [ "macos-15" ]
postgresql-version: [ "16" ]
include:
- destination: "platform=iOS Simulator,OS=18.1,name=iPhone 15"
xcode: "15.4"
simulator-platform: "iOS"
simulator-version: "18.1"
swift: "5.10.1"
os: "macos-14"
postgresql-version: "16"
- destination: "platform=iOS Simulator,OS=17.5,name=iPhone 15"
xcode: "15.4"
simulator-platform: "iOS"
Expand Down Expand Up @@ -206,7 +213,7 @@ jobs:

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

- name: Upload recording
uses: actions/[email protected]
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ jobs:
strategy:
fail-fast: false
matrix:
destination: [ "platform=iOS Simulator,OS=18.1,name=iPhone 15" ]
xcode: [ "15.4" ]
destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 16" ]
xcode: [ "16.2" ]
simulator-platform: [ "iOS" ]
simulator-version: [ "18.1" ]
swift: [ "5.10.1" ]
os: [ "macos-14" ]
simulator-version: [ "18.2" ]
swift: [ "6.0.2" ]
os: [ "macos-15" ]
postgresql-version: [ "16" ]
fusionauth-docker-image-version: [ "1.51.2", "1.52.1", "1.53.3", "1.54.0", "1.55.1" ]

Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:

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

- name: Upload recording
uses: actions/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions Samples/Quickstart/QuickstartTests/QuickstartTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@

passwordField.tap()
passwordField.typeText("password")

submitButton.tap()

Check warning on line 59 in Samples/Quickstart/QuickstartTests/QuickstartTests.swift

View workflow job for this annotation

GitHub Actions / Swift Lint Check 

[lint] reported by reviewdog 🐶
Lines should not have trailing whitespace

Raw Output:
{"level":"warning","locations":[{"physicalLocation":{"artifactLocation":{"uri":"Samples/Quickstart/QuickstartTests/QuickstartTests.swift"},"region":{"startColumn":1,"startLine":59}}}],"message":{"text":"Lines should not have trailing whitespace"},"ruleId":"trailing_whitespace"}
passwordField.typeText("\n")

// Check that Welcome message is displayed
let welcomeText = app.staticTexts["Welcome Richard Hendricks"]
Expand Down
2 changes: 1 addition & 1 deletion Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
mainGroup = 0E2795EC2BD937B800738892;
packageReferences = (
0E5184912CD6279C004E2416 /* XCLocalSwiftPackageReference "../../../fusionauth-swift-sdk" */,
);
);
productRefGroup = 0E2795F62BD937B800738892 /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down
Loading