Skip to content

Commit c1376cd

Browse files
mrudatsprintmrudatsprint
authored
Merge pull request #103 from FusionAuth/mike/bump-swift-6.2-xcode-26.0.1
Mike/bump swift 6.x xcode 26.0.1
2 parents d566ad4 + fd4570f commit c1376cd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+7566
-116
lines changed

‎.github/workflows/codeql-package.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: "Security and Code-Quality scan with CodeQL - Package"
22

33
on:
4+
# Triggers the workflow on push events but only for default and protected branches
5+
push:
6+
branches: [ "main" ]
47
# Triggers the workflow on pull request events but only for default and protected branches
58
pull_request:
69
branches: [ "main" ]
@@ -43,7 +46,7 @@ jobs:
4346
fail-fast: false
4447
matrix:
4548
# https://github.com/swiftlang/swift/releases
46-
swift: [ "6.0.2" ]
49+
swift: [ "6.0.3" ]
4750
# https://developer.apple.com/documentation/xcode-release-notes
4851
xcode: [ "16.2" ]
4952
language: [ swift ]
@@ -82,11 +85,11 @@ jobs:
8285

8386
# Checkout the repository.
8487
- name: Checkout repository
85-
uses: actions/checkout@v4.2.2
88+
uses: actions/checkout@v5.0.0
8689

8790
# Initialize CodeQL.
8891
- name: Initialize CodeQL
89-
uses: github/codeql-action/init@v3.28.17
92+
uses: github/codeql-action/init@v4.31.2
9093
with:
9194
languages: ${{ matrix.language }}
9295
build-mode: ${{ matrix.build-mode }}
@@ -101,8 +104,8 @@ jobs:
101104

102105
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
103106
# If this step fails, then you should remove it and run the build manually (see below)
104-
#- name: Autobuild
105-
# uses: github/codeql-action/autobuild@v3.26.5
107+
# - name: Autobuild
108+
# uses: github/codeql-action/autobuild@v4.31.2
106109

107110
# Check disk space.
108111
- name: Check Disk Space
@@ -116,7 +119,7 @@ jobs:
116119

117120
# Perform CodeQL analysis after the build has completed successfully or failed.
118121
- name: Perform CodeQL Analysis
119-
uses: github/codeql-action/analyze@v3.28.17
122+
uses: github/codeql-action/analyze@v4.31.2
120123
if: success() || failure()
121124
with:
122125
category: "/language:${{matrix.language}}"

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: "Security and Code-Quality scan with CodeQL - Quickstart Sample"
22

33
on:
4+
# Triggers the workflow on push events but only for default and protected branches
5+
push:
6+
branches: [ "main" ]
47
# Triggers the workflow on pull request events but only for default and protected branches
58
pull_request:
69
branches: [ "main" ]
@@ -43,13 +46,13 @@ jobs:
4346
fail-fast: false
4447
matrix:
4548
# https://github.com/swiftlang/swift/releases
46-
swift: [ "6.0.2" ]
49+
swift: [ "6.1.0" ]
4750
# https://developer.apple.com/documentation/xcode-release-notes
48-
xcode: [ "16.2" ]
51+
xcode: [ "26.0.1" ]
4952
language: [ swift ]
5053
build-mode: [ manual ]
5154
destination:
52-
- "platform=iOS Simulator,OS=18.2,name=iPhone 16"
55+
- "platform=iOS Simulator,OS=26.0.1,name=iPhone 17"
5356
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
5457
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
5558
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
@@ -84,11 +87,11 @@ jobs:
8487

8588
# Checkout the repository.
8689
- name: Checkout repository
87-
uses: actions/checkout@v4.2.2
90+
uses: actions/checkout@v5.0.0
8891

8992
# Initialize CodeQL.
9093
- name: Initialize CodeQL
91-
uses: github/codeql-action/init@v3.28.17
94+
uses: github/codeql-action/init@v4.31.0
9295
with:
9396
languages: ${{ matrix.language }}
9497
build-mode: ${{ matrix.build-mode }}
@@ -104,22 +107,25 @@ jobs:
104107

105108
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
106109
# If this step fails, then you should remove it and run the build manually (see below)
107-
#- name: Autobuild
108-
# uses: github/codeql-action/autobuild@v3.26.5
110+
# - name: Autobuild
111+
# uses: github/codeql-action/autobuild@v4.31.0
109112

110113
# Check Disk Space before the build.
111114
- name: Check Disk Space
112115
run: |
113116
sleep 10
114117
df -h
115118
119+
- name: List available simulators
120+
run: xcodebuild -showdestinations -scheme fusionauth-quickstart-swift-ios-native-swift-6
121+
116122
# Perform the build manually.
117123
- name: Manual Build
118-
run: set -o pipefail && xcodebuild -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native -destination "${{matrix.destination}}" -skipPackagePluginValidation -parallel-testing-enabled NO
124+
run: set -o pipefail && xcodebuild -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native-swift-6 -destination "${{matrix.destination}}" -skipPackagePluginValidation -parallel-testing-enabled NO
119125

120126
# Perform CodeQL Analysis if the build succeeded or failed.
121127
- name: Perform CodeQL Analysis
122-
uses: github/codeql-action/analyze@v3.28.17
128+
uses: github/codeql-action/analyze@v4.31.0
123129
if: success() || failure()
124130
with:
125131
category: "/language:${{matrix.language}}"

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This workflow performs a full End 2 End test of the App
2-
# It runs the test on the last 5 iOS releases.
2+
# And uses the latest iOS Target API level requirements.
33

44
name: E2E Test with latest FusionAuth and latest iOS
55

@@ -36,11 +36,11 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 16" ]
40-
xcode: [ "16.2" ]
39+
destination: [ "platform=iOS Simulator,OS=26.0.1,name=iPhone 17" ]
40+
xcode: [ "26.0.1" ]
4141
simulator-platform: [ "iOS" ]
42-
simulator-version: [ "18.2" ]
43-
swift: [ "6.0.2" ]
42+
simulator-version: [ "26.0.1" ]
43+
swift: [ "6.1.0" ]
4444
os: [ "macos-15" ]
4545
postgresql-version: [ "16" ]
4646

@@ -95,9 +95,9 @@ jobs:
9595

9696
# Checkout the repository.
9797
- name: Checkout repository
98-
uses: actions/checkout@v4.2.2
98+
uses: actions/checkout@v5.0.0
9999

100-
# Install FusionAuth with brew.
100+
# Install PostgreSQL with brew.
101101
- name: Install PostgreSQL
102102
run: brew install postgresql@${{ matrix.postgresql-version }} -v
103103

@@ -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 -parallel-testing-enabled NO
187+
run: set -o pipefail && xcodebuild test -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native-swift-6 -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: 23 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow performs a full End 2 End test of the App
2-
# It runs the test on the last 5 iOS releases.
2+
# It runs the test on the iOS releases over the last ~18 months
33

4-
name: E2E Test with latest FusionAuth
4+
name: E2E Test with latest FusionAuth and iOS releases
55

66
on:
77
# Triggers the workflow on pull request events but only for default and protected branches
@@ -13,7 +13,7 @@ on:
1313
workflow_call:
1414

1515
env:
16-
fusionauth-docker-image-version: "1.57.0"
16+
fusionauth-docker-image-version: "latest"
1717

1818
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1919
jobs:
@@ -36,42 +36,31 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 16" ]
40-
xcode: [ "16.2" ]
39+
destination: [ "platform=iOS Simulator,OS=26.0.1,name=iPhone 17" ]
40+
xcode: [ "26.0.1" ]
4141
simulator-platform: [ "iOS" ]
42-
simulator-version: [ "18.2" ]
43-
swift: [ "6.0.2" ]
42+
simulator-version: [ "26.0.1" ]
43+
swift: [ "6.1.0" ]
4444
os: [ "macos-15" ]
4545
postgresql-version: [ "16" ]
46+
scheme: [ "fusionauth-quickstart-swift-ios-native-swift-6" ]
4647
include:
47-
- destination: "platform=iOS Simulator,OS=18.1,name=iPhone 15"
48-
xcode: "15.4"
48+
- destination: "platform=iOS Simulator,OS=18.5,name=iPhone 16"
49+
xcode: "16.4"
4950
simulator-platform: "iOS"
50-
simulator-version: "18.1"
51-
swift: "5.10.1"
52-
os: "macos-14"
51+
simulator-version: "18.5"
52+
swift: "6.1.0"
53+
os: "macos-15"
5354
postgresql-version: "16"
55+
scheme: "fusionauth-quickstart-swift-ios-native"
5456
- destination: "platform=iOS Simulator,OS=17.5,name=iPhone 15"
5557
xcode: "15.4"
5658
simulator-platform: "iOS"
5759
simulator-version: "17.5"
5860
swift: "5.10.1"
5961
os: "macos-14"
6062
postgresql-version: "16"
61-
- destination: "platform=iOS Simulator,OS=16.4,name=iPhone 14"
62-
xcode: "14.3.1"
63-
simulator-platform: "iOS"
64-
simulator-version: "16.4"
65-
swift: "5.8.1"
66-
os: "macos-13"
67-
postgresql-version: "16"
68-
- destination: "platform=iOS Simulator,OS=15.5,name=iPhone 13"
69-
xcode: "14.3.1"
70-
simulator-platform: "iOS"
71-
simulator-version: "15.5"
72-
swift: "5.8.1"
73-
os: "macos-13"
74-
postgresql-version: "16"
63+
scheme: "fusionauth-quickstart-swift-ios-native"
7564

7665
# Steps represent a sequence of tasks that will be executed as part of the job
7766
steps:
@@ -124,9 +113,9 @@ jobs:
124113

125114
# Checkout the repository.
126115
- name: Checkout repository
127-
uses: actions/checkout@v4.2.2
116+
uses: actions/checkout@v5.0.0
128117

129-
# Install FusionAuth with brew.
118+
# Install PostgreSQL with brew.
130119
- name: Install PostgreSQL
131120
run: brew install postgresql@${{ matrix.postgresql-version }} -v
132121

@@ -146,15 +135,13 @@ jobs:
146135
- name: Add PostgreSQL fusionauth database
147136
run: createdb --owner=fusionauth fusionauth
148137

149-
# Download FusionAuth App formula.
150-
- name: Download FusionAuth App formula
151-
run: |
152-
mkdir -p ./homebrew-fusionauth-app-formula
153-
curl -L https://raw.githubusercontent.com/FusionAuth/homebrew-fusionauth/refs/tags/${{ env.fusionauth-docker-image-version }}/Formula/fusionauth-app.rb -o ./homebrew-fusionauth-app-formula/fusionauth-app.rb
138+
# Tap FusionAuth Homebrew formulae.
139+
- name: Tap FusionAuth Homebrew formulae
140+
run: brew tap fusionauth/fusionauth
154141

155-
# Install FusionAuth App formula with brew.
142+
# Install FusionAuth App with brew.
156143
- name: Install FusionAuth App
157-
run: brew install --formula ./homebrew-fusionauth-app-formula/fusionauth-app.rb -v
144+
run: brew install fusionauth-app -v
158145

159146
# Configure FusionAuth App with silent mode.
160147
- name: Configure FusionAuth App
@@ -215,7 +202,7 @@ jobs:
215202

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

220207
- name: Upload recording
221208
uses: actions/[email protected]

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# It includes all FusionAuth versions of the past ~6 months.
33
# And uses the latest iOS Target API level requirements.
44

5-
name: E2E Test with FusionAuth supported versions
5+
name: E2E Test with FusionAuth supported versions and latest iOS
66

77
on:
88
# Allows you to run this workflow manually from the Actions tab
@@ -31,14 +31,14 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 16" ]
35-
xcode: [ "16.2" ]
34+
destination: [ "platform=iOS Simulator,OS=26.0.1,name=iPhone 17" ]
35+
xcode: [ "26.0.1" ]
3636
simulator-platform: [ "iOS" ]
37-
simulator-version: [ "18.2" ]
38-
swift: [ "6.0.2" ]
37+
simulator-version: [ "26.0.1" ]
38+
swift: [ "6.1.0" ]
3939
os: [ "macos-15" ]
4040
postgresql-version: [ "16" ]
41-
fusionauth-docker-image-version: [ "1.56.0", "1.57.0" ]
41+
fusionauth-docker-image-version: [ "1.57.1", "1.58.3", "1.59.1", "1.60.2", "1.61.0" ]
4242

4343
# Steps represent a sequence of tasks that will be executed as part of the job
4444
steps:
@@ -91,9 +91,9 @@ jobs:
9191

9292
# Checkout the repository.
9393
- name: Checkout repository
94-
uses: actions/checkout@v4.2.2
94+
uses: actions/checkout@v5.0.0
9595

96-
# Install FusionAuth with brew.
96+
# Install PostgreSQL with brew.
9797
- name: Install PostgreSQL
9898
run: brew install postgresql@${{ matrix.postgresql-version }} -v
9999

@@ -116,12 +116,12 @@ jobs:
116116
# Download FusionAuth App formula.
117117
- name: Download FusionAuth App formula
118118
run: |
119-
mkdir -p ./homebrew-fusionauth-app-formula
120-
curl -L https://raw.githubusercontent.com/FusionAuth/homebrew-fusionauth/refs/tags/${{ matrix.fusionauth-docker-image-version }}/Formula/fusionauth-app.rb -o ./homebrew-fusionauth-app-formula/fusionauth-app.rb
119+
mkdir -p $(brew --repository)/Library/Taps/local/homebrew-tap/Formula
120+
curl -L https://raw.githubusercontent.com/FusionAuth/homebrew-fusionauth/refs/tags/${{ matrix.fusionauth-docker-image-version }}/Formula/fusionauth-app.rb -o $(brew --repository)/Library/Taps/local/homebrew-tap/Formula/fusionauth-app.rb
121121
122122
# Install FusionAuth App formula with brew.
123123
- name: Install FusionAuth App
124-
run: brew install --formula ./homebrew-fusionauth-app-formula/fusionauth-app.rb -v
124+
run: brew install --formula $(brew --repository)/Library/Taps/local/homebrew-tap/Formula/fusionauth-app.rb -v
125125

126126
# Configure FusionAuth App with silent mode.
127127
- name: Configure FusionAuth App
@@ -182,7 +182,7 @@ jobs:
182182

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

187187
- name: Upload recording
188188
uses: actions/[email protected]

‎.github/workflows/mobsf.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: "Vulnerability Scan with MobSF"
22

33
on:
4+
# Triggers the workflow on push events but only for default and protected branches
5+
push:
6+
branches: [ "main" ]
47
# Triggers the workflow on pull request events but only for default and protected branches
58
pull_request:
69
branches: [ "main" ]
@@ -27,7 +30,7 @@ jobs:
2730
runs-on: ubuntu-latest
2831

2932
steps:
30-
- uses: actions/checkout@v4.2.2
33+
- uses: actions/checkout@v5.0.0
3134

3235
# Sets up the python as a prerequisites for MobSF
3336
- name: Setup python
@@ -37,7 +40,7 @@ jobs:
3740

3841
# Sets up the reviewdog cli
3942
- name: Setup reviewdog
40-
uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.2
43+
uses: reviewdog/action-setup@d8edfce3dd5e1ec6978745e801f9c50b5ef80252 # v1.4.0
4144

4245
- name: Show reviewdog version
4346
run: reviewdog -version
@@ -50,7 +53,7 @@ jobs:
5053

5154
# Uploads Sarif Report to GitHub
5255
- name: Upload mobsfscan report
53-
uses: github/codeql-action/upload-sarif@v3.28.17
56+
uses: github/codeql-action/upload-sarif@v4.31.2
5457
if: success() || failure()
5558
with:
5659
sarif_file: mobsf.sarif.json

0 commit comments

Comments
 (0)