From 4f0821a2aaf63d5958a5f71235f11429830b935d Mon Sep 17 00:00:00 2001 From: Aaron Ritter Date: Sat, 30 Nov 2024 17:04:23 +0100 Subject: [PATCH 01/18] build(deps): bump swift 6.0.2 xcode 16.1 --- .github/workflows/codeql-package.yml | 6 +++--- .github/workflows/codeql-samples-quickstart.yml | 6 +++--- .../e2e-test-fusionauth-latest-ios-matrix.yml | 13 ++++++++++--- .../e2e-test-fusionauth-matrix-ios-latest.yml | 6 +++--- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/codeql-package.yml b/.github/workflows/codeql-package.yml index fdc4108..34ce770 100644 --- a/.github/workflows/codeql-package.yml +++ b/.github/workflows/codeql-package.yml @@ -41,9 +41,9 @@ 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.1"] language: [swift] build-mode: [manual] # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, @@ -70,7 +70,7 @@ jobs: # Initialize Swift in the matrix specified version. - name: Initialize Swift - uses: swift-actions/setup-swift@v2.1.0 + uses: SwiftyLab/setup-swift@v1.9.0 with: swift-version: ${{ matrix.swift }} diff --git a/.github/workflows/codeql-samples-quickstart.yml b/.github/workflows/codeql-samples-quickstart.yml index 1401f11..5ce0531 100644 --- a/.github/workflows/codeql-samples-quickstart.yml +++ b/.github/workflows/codeql-samples-quickstart.yml @@ -41,9 +41,9 @@ 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.1" ] language: [ swift ] build-mode: [ manual ] destination: @@ -72,7 +72,7 @@ jobs: # Initialize Swift in the matrix specified version. - name: Initialize Swift - uses: swift-actions/setup-swift@v2.1.0 + uses: SwiftyLab/setup-swift@v1.9.0 with: swift-version: ${{ matrix.swift }} diff --git a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml index 6817282..912b692 100644 --- a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml +++ b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml @@ -35,13 +35,20 @@ jobs: fail-fast: false matrix: destination: [ "platform=iOS Simulator,OS=18.1,name=iPhone 15" ] - xcode: [ "15.4" ] + xcode: [ "16.1" ] simulator-platform: [ "iOS" ] simulator-version: [ "18.1" ] - swift: [ "5.10.1" ] + swift: [ "6.0.2" ] os: [ "macos-14" ] 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" @@ -105,7 +112,7 @@ jobs: # Initialize Swift in the matrix specified version. - name: Initialize Swift - uses: swift-actions/setup-swift@v2.1.0 + uses: SwiftyLab/setup-swift@v1.9.0 with: swift-version: ${{ matrix.swift }} diff --git a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml index 4f7ec4f..eee7dbb 100644 --- a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml +++ b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml @@ -33,10 +33,10 @@ jobs: fail-fast: false matrix: destination: [ "platform=iOS Simulator,OS=18.1,name=iPhone 15" ] - xcode: [ "15.4" ] + xcode: [ "16.1" ] simulator-platform: [ "iOS" ] simulator-version: [ "18.1" ] - swift: [ "5.10.1" ] + swift: [ "6.0.2" ] os: [ "macos-14" ] postgresql-version: [ "16" ] fusionauth-docker-image-version: [ "1.47.1", "1.48.3", "1.49.2", "1.50.1", "1.51.2", "1.52.1", "1.53.3", "1.54.0" ] @@ -83,7 +83,7 @@ jobs: # Initialize Swift in the matrix specified version. - name: Initialize Swift - uses: swift-actions/setup-swift@v2.1.0 + uses: SwiftyLab/setup-swift@v1.9.0 with: swift-version: ${{ matrix.swift }} From d45a21b083877dde1024349b7c1c1effded7435b Mon Sep 17 00:00:00 2001 From: Aaron Ritter Date: Sat, 30 Nov 2024 17:10:14 +0100 Subject: [PATCH 02/18] ci(e2e-test): fix matrix syntax --- .../e2e-test-fusionauth-latest-ios-matrix.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml index 912b692..9f7ff0c 100644 --- a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml +++ b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml @@ -42,13 +42,13 @@ jobs: os: [ "macos-14" ] 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=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" From a0299900a47cb01291db8e9dbc0cbc23ef6b246c Mon Sep 17 00:00:00 2001 From: Aaron Ritter Date: Sat, 30 Nov 2024 17:51:12 +0100 Subject: [PATCH 03/18] ci(e2e-test): change back to swift-actions/setup-swift@v2.1.0 --- .github/workflows/codeql-package.yml | 2 +- .github/workflows/codeql-samples-quickstart.yml | 2 +- .github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml | 2 +- .github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-package.yml b/.github/workflows/codeql-package.yml index 34ce770..70a8959 100644 --- a/.github/workflows/codeql-package.yml +++ b/.github/workflows/codeql-package.yml @@ -70,7 +70,7 @@ jobs: # Initialize Swift in the matrix specified version. - name: Initialize Swift - uses: SwiftyLab/setup-swift@v1.9.0 + uses: swift-actions/setup-swift@v2.1.0 with: swift-version: ${{ matrix.swift }} diff --git a/.github/workflows/codeql-samples-quickstart.yml b/.github/workflows/codeql-samples-quickstart.yml index 5ce0531..30302a0 100644 --- a/.github/workflows/codeql-samples-quickstart.yml +++ b/.github/workflows/codeql-samples-quickstart.yml @@ -72,7 +72,7 @@ jobs: # Initialize Swift in the matrix specified version. - name: Initialize Swift - uses: SwiftyLab/setup-swift@v1.9.0 + uses: swift-actions/setup-swift@v2.1.0 with: swift-version: ${{ matrix.swift }} diff --git a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml index 9f7ff0c..15cb538 100644 --- a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml +++ b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml @@ -112,7 +112,7 @@ jobs: # Initialize Swift in the matrix specified version. - name: Initialize Swift - uses: SwiftyLab/setup-swift@v1.9.0 + uses: swift-actions/setup-swift@v2.1.0 with: swift-version: ${{ matrix.swift }} diff --git a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml index eee7dbb..d729d1c 100644 --- a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml +++ b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml @@ -83,7 +83,7 @@ jobs: # Initialize Swift in the matrix specified version. - name: Initialize Swift - uses: SwiftyLab/setup-swift@v1.9.0 + uses: swift-actions/setup-swift@v2.1.0 with: swift-version: ${{ matrix.swift }} From 39d8007603906ac89f0b76a9d4a5b1a6cbce0b9a Mon Sep 17 00:00:00 2001 From: Aaron Ritter Date: Sat, 30 Nov 2024 17:55:22 +0100 Subject: [PATCH 04/18] ci(e2e-test): disable swift initialization if 6.0.2 --- .github/workflows/codeql-package.yml | 1 + .github/workflows/codeql-samples-quickstart.yml | 1 + .github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml | 1 + .github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/codeql-package.yml b/.github/workflows/codeql-package.yml index 70a8959..8a65246 100644 --- a/.github/workflows/codeql-package.yml +++ b/.github/workflows/codeql-package.yml @@ -70,6 +70,7 @@ jobs: # Initialize Swift in the matrix specified version. - name: Initialize Swift + if: matrix.swift != '6.0.2' uses: swift-actions/setup-swift@v2.1.0 with: swift-version: ${{ matrix.swift }} diff --git a/.github/workflows/codeql-samples-quickstart.yml b/.github/workflows/codeql-samples-quickstart.yml index 30302a0..599f02f 100644 --- a/.github/workflows/codeql-samples-quickstart.yml +++ b/.github/workflows/codeql-samples-quickstart.yml @@ -72,6 +72,7 @@ jobs: # Initialize Swift in the matrix specified version. - name: Initialize Swift + if: matrix.swift != '6.0.2' uses: swift-actions/setup-swift@v2.1.0 with: swift-version: ${{ matrix.swift }} diff --git a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml index 15cb538..2bd9409 100644 --- a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml +++ b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml @@ -112,6 +112,7 @@ jobs: # Initialize Swift in the matrix specified version. - name: Initialize Swift + if: matrix.swift != '6.0.2' uses: swift-actions/setup-swift@v2.1.0 with: swift-version: ${{ matrix.swift }} diff --git a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml index d729d1c..d951435 100644 --- a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml +++ b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml @@ -83,6 +83,7 @@ jobs: # Initialize Swift in the matrix specified version. - name: Initialize Swift + if: matrix.swift != '6.0.2' uses: swift-actions/setup-swift@v2.1.0 with: swift-version: ${{ matrix.swift }} From 2c6153889f1a05e6c22e7309b4921c755d854b8d Mon Sep 17 00:00:00 2001 From: Aaron Ritter Date: Sat, 7 Dec 2024 14:54:15 +0100 Subject: [PATCH 05/18] build(deps): bump pre swift 5.10 AppAuth dependency and update Package.resolved --- Package.resolved | 12 ++++++------ Package.swift | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Package.resolved b/Package.resolved index 2cb1c61..b046b6f 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/openid/AppAuth-iOS.git", "state" : { - "revision" : "c89ed571ae140f8eb1142735e6e23d7bb8c34cb2", - "version" : "1.7.5" + "revision" : "2781038865a80e2c425a1da12cc1327bcd56501f", + "version" : "1.7.6" } }, { @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-syntax.git", "state" : { - "revision" : "515f79b522918f83483068d99c68daeb5116342d", - "version" : "600.0.0-prerelease-2024-08-14" + "revision" : "cb53fa1bd3219b0b23ded7dfdd3b2baff266fd25", + "version" : "600.0.0" } }, { @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/realm/SwiftLint.git", "state" : { - "revision" : "168fb98ed1f3e343d703ecceaf518b6cf565207b", - "version" : "0.57.0" + "revision" : "25f2776977e663305bee71309ea1e34d435065f1", + "version" : "0.57.1" } }, { diff --git a/Package.swift b/Package.swift index e2c4d07..dba7af8 100644 --- a/Package.swift +++ b/Package.swift @@ -50,7 +50,7 @@ let package = Package( targets: ["FusionAuth"]), ], dependencies: [ - .package(url: "https://github.com/openid/AppAuth-iOS.git", exact: "1.7.5") + .package(url: "https://github.com/openid/AppAuth-iOS.git", exact: "1.7.6") ], targets: [ // Targets are the basic building blocks of a package, defining a module or a test suite. From c938b2ef1252c80d4707c2c8f735da7649862cef Mon Sep 17 00:00:00 2001 From: Aaron Ritter Date: Mon, 9 Dec 2024 03:45:20 +0100 Subject: [PATCH 06/18] fix(quickstart): correct project repo directory --- .../project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj b/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj index 7d44f72..56ecc56 100644 --- a/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj +++ b/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj @@ -211,7 +211,7 @@ ); mainGroup = 0E2795EC2BD937B800738892; packageReferences = ( - 0E5184912CD6279C004E2416 /* XCLocalSwiftPackageReference "../../../fusionauth-ios-mobilesdk" */, + 0E5184912CD6279C004E2416 /* XCLocalSwiftPackageReference "../../../fusionauth-swift-sdk" */, ); productRefGroup = 0E2795F62BD937B800738892 /* Products */; projectDirPath = ""; From 49cc60e200dbc027ce3de00122aa42702347122d Mon Sep 17 00:00:00 2001 From: Aaron Ritter Date: Mon, 9 Dec 2024 10:26:25 +0100 Subject: [PATCH 07/18] refactor(quickstart): relative package dependency --- .../project.pbxproj | 9 ++++----- .../xcshareddata/swiftpm/Package.resolved | 15 +++++++-------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj b/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj index 56ecc56..c46e617 100644 --- a/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj +++ b/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj @@ -19,7 +19,7 @@ 0E8454CC2BF50CE8007C5E0D /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E8454CB2BF50CE8007C5E0D /* HomeView.swift */; }; 0E8454CE2BF50D19007C5E0D /* MakeChangeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E8454CD2BF50D19007C5E0D /* MakeChangeView.swift */; }; 0EB100102CD90699007AB813 /* FusionAuth.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0EB1000F2CD90699007AB813 /* FusionAuth.plist */; }; - 9326C2A12C80692B001C9CDB /* fusionauth-ios-mobilesdk in Resources */ = {isa = PBXBuildFile; fileRef = 9326C2A02C80692B001C9CDB /* fusionauth-ios-mobilesdk */; }; + 9326C2A12C80692B001C9CDB /* .. in Resources */ = {isa = PBXBuildFile; fileRef = 9326C2A02C80692B001C9CDB /* .. */; }; 939AED192CC91492000E2D3F /* QuickstartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 939AED162CC91492000E2D3F /* QuickstartTests.swift */; }; /* End PBXBuildFile section */ @@ -47,7 +47,7 @@ 0E8454CB2BF50CE8007C5E0D /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; 0E8454CD2BF50D19007C5E0D /* MakeChangeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MakeChangeView.swift; sourceTree = ""; }; 0EB1000F2CD90699007AB813 /* FusionAuth.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = FusionAuth.plist; sourceTree = ""; }; - 9326C2A02C80692B001C9CDB /* fusionauth-ios-mobilesdk */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "fusionauth-ios-mobilesdk"; path = ../../..; sourceTree = ""; }; + 9326C2A02C80692B001C9CDB /* .. */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ..; path = ../..; sourceTree = ""; }; 939AED162CC91492000E2D3F /* QuickstartTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickstartTests.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -126,7 +126,7 @@ 9326C2432C8067DA001C9CDB /* Packages */ = { isa = PBXGroup; children = ( - 9326C2A02C80692B001C9CDB /* fusionauth-ios-mobilesdk */, + 9326C2A02C80692B001C9CDB /* .. */, ); path = Packages; sourceTree = ""; @@ -211,7 +211,6 @@ ); mainGroup = 0E2795EC2BD937B800738892; packageReferences = ( - 0E5184912CD6279C004E2416 /* XCLocalSwiftPackageReference "../../../fusionauth-swift-sdk" */, ); productRefGroup = 0E2795F62BD937B800738892 /* Products */; projectDirPath = ""; @@ -237,7 +236,7 @@ files = ( 0EB100102CD90699007AB813 /* FusionAuth.plist in Resources */, 0E2796002BD937BA00738892 /* Preview Assets.xcassets in Resources */, - 9326C2A12C80692B001C9CDB /* fusionauth-ios-mobilesdk in Resources */, + 9326C2A12C80692B001C9CDB /* .. in Resources */, 0E2795FD2BD937BA00738892 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7c88c90..b046b6f 100644 --- a/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,13 +1,12 @@ { - "originHash" : "c05d28226189e45a69b8ff5970b5b77e587a1681d5be7e6e439068f244500605", "pins" : [ { "identity" : "appauth-ios", "kind" : "remoteSourceControl", "location" : "https://github.com/openid/AppAuth-iOS.git", "state" : { - "revision" : "c89ed571ae140f8eb1142735e6e23d7bb8c34cb2", - "version" : "1.7.5" + "revision" : "2781038865a80e2c425a1da12cc1327bcd56501f", + "version" : "1.7.6" } }, { @@ -51,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-syntax.git", "state" : { - "revision" : "515f79b522918f83483068d99c68daeb5116342d", - "version" : "600.0.0-prerelease-2024-08-14" + "revision" : "cb53fa1bd3219b0b23ded7dfdd3b2baff266fd25", + "version" : "600.0.0" } }, { @@ -60,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/realm/SwiftLint.git", "state" : { - "revision" : "a24488f26e60247d8fff7bbb03d51910af3dc91c", - "version" : "0.56.2" + "revision" : "25f2776977e663305bee71309ea1e34d435065f1", + "version" : "0.57.1" } }, { @@ -92,5 +91,5 @@ } } ], - "version" : 3 + "version" : 2 } From 9629e3de2e5c22ef4fae6f54c5064e154a935fb4 Mon Sep 17 00:00:00 2001 From: Aaron Ritter Date: Mon, 9 Dec 2024 12:01:14 +0100 Subject: [PATCH 08/18] refactor(quickstart): enable ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES --- .../project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj b/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj index c46e617..11404be 100644 --- a/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj +++ b/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj @@ -315,6 +315,7 @@ 0E2796012BD937BA00738892 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; @@ -378,6 +379,7 @@ 0E2796022BD937BA00738892 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; From d8573f673eef0778023d6a9a27879bdb9c10034c Mon Sep 17 00:00:00 2001 From: Colin Frick Date: Mon, 9 Dec 2024 13:35:09 +0100 Subject: [PATCH 09/18] build: move SwiftLint to testTarget --- Package.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index dba7af8..63cab6c 100644 --- a/Package.swift +++ b/Package.swift @@ -27,12 +27,12 @@ let package = Package( name: "FusionAuth", dependencies: [ .product(name: "AppAuth", package: "AppAuth-iOS") - ], - plugins: [.plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLint")] + ] ), .testTarget( name: "FusionAuthTests", - dependencies: ["FusionAuth"] + dependencies: ["FusionAuth"], + plugins: [.plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLint")] ), ] ) From 67b87e2ca38b09b8d082c106e226e0710cff2bc1 Mon Sep 17 00:00:00 2001 From: Aaron Ritter Date: Wed, 11 Dec 2024 21:19:05 +0100 Subject: [PATCH 10/18] ci(e2e-test): remove fusionauth-search --- .../workflows/e2e-test-fusionauth-latest-ios-matrix.yml | 8 -------- .../workflows/e2e-test-fusionauth-matrix-ios-latest.yml | 8 -------- 2 files changed, 16 deletions(-) diff --git a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml index 2bd9409..2c731d2 100644 --- a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml +++ b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml @@ -172,10 +172,6 @@ jobs: - name: Tap FusionAuth Homebrew formulae run: brew tap sonderformat-llc/fusionauth - # Install FusionAuth Search with brew. - - name: Install FusionAuth Search - run: brew install fusionauth-search -v - # Install FusionAuth App with brew. - name: Install FusionAuth App run: brew install fusionauth-app -v @@ -188,10 +184,6 @@ jobs: echo "fusionauth-app.silent-mode=true" >> $(brew --prefix)/etc/fusionauth/fusionauth.properties cat $(brew --prefix)/etc/fusionauth/fusionauth.properties - # Start FusionAuth Search. - - name: Start FusionAuth Search - run: brew services start fusionauth-search -v - # Start FusionAuth App. - name: Start FusionAuth App run: brew services start fusionauth-app -v diff --git a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml index d951435..6014574 100644 --- a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml +++ b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml @@ -120,10 +120,6 @@ jobs: - name: Tap FusionAuth Homebrew formulae run: brew tap sonderformat-llc/fusionauth - # Install FusionAuth Search with brew. - - name: Install FusionAuth Search - run: brew install fusionauth-search -v - # Install FusionAuth App with brew. - name: Install FusionAuth App run: brew install fusionauth-app -v @@ -136,10 +132,6 @@ jobs: echo "fusionauth-app.silent-mode=true" >> $(brew --prefix)/etc/fusionauth/fusionauth.properties cat $(brew --prefix)/etc/fusionauth/fusionauth.properties - # Start FusionAuth Search. - - name: Start FusionAuth Search - run: brew services start fusionauth-search -v - # Start FusionAuth App. - name: Start FusionAuth App run: brew services start fusionauth-app -v From e173089318131c07ef8a29fec3d66b3134ecc952 Mon Sep 17 00:00:00 2001 From: Aaron Ritter Date: Sat, 18 Jan 2025 11:30:39 +0100 Subject: [PATCH 11/18] fix: update to latest xcode 16.2 and swift 6.0.3 --- .github/workflows/codeql-package.yml | 4 ++-- .github/workflows/codeql-samples-quickstart.yml | 4 ++-- .github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml | 4 ++-- .github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codeql-package.yml b/.github/workflows/codeql-package.yml index dacbf37..7a178c8 100644 --- a/.github/workflows/codeql-package.yml +++ b/.github/workflows/codeql-package.yml @@ -41,9 +41,9 @@ jobs: fail-fast: false matrix: # https://github.com/swiftlang/swift/releases - swift: ["6.0.2"] + swift: ["6.0.3"] # https://developer.apple.com/documentation/xcode-release-notes - xcode: ["16.1"] + 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, diff --git a/.github/workflows/codeql-samples-quickstart.yml b/.github/workflows/codeql-samples-quickstart.yml index 62514f9..8e8ae85 100644 --- a/.github/workflows/codeql-samples-quickstart.yml +++ b/.github/workflows/codeql-samples-quickstart.yml @@ -41,9 +41,9 @@ jobs: fail-fast: false matrix: # https://github.com/swiftlang/swift/releases - swift: [ "6.0.2" ] + swift: [ "6.0.3" ] # https://developer.apple.com/documentation/xcode-release-notes - xcode: [ "16.1" ] + xcode: [ "16.2" ] language: [ swift ] build-mode: [ manual ] destination: diff --git a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml index aaea02a..e1f2e4f 100644 --- a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml +++ b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml @@ -37,10 +37,10 @@ jobs: fail-fast: false matrix: destination: [ "platform=iOS Simulator,OS=18.1,name=iPhone 15" ] - xcode: [ "16.1" ] + xcode: [ "16.2" ] simulator-platform: [ "iOS" ] simulator-version: [ "18.1" ] - swift: [ "6.0.2" ] + swift: [ "6.0.3" ] os: [ "macos-14" ] postgresql-version: [ "16" ] include: diff --git a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml index cb045b6..8ca85f0 100644 --- a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml +++ b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml @@ -32,10 +32,10 @@ jobs: fail-fast: false matrix: destination: [ "platform=iOS Simulator,OS=18.1,name=iPhone 15" ] - xcode: [ "16.1" ] + xcode: [ "16.2" ] simulator-platform: [ "iOS" ] simulator-version: [ "18.1" ] - swift: [ "6.0.2" ] + swift: [ "6.0.3" ] os: [ "macos-14" ] postgresql-version: [ "16" ] fusionauth-docker-image-version: [ "1.51.2", "1.52.1", "1.53.3", "1.54.0", "1.55.1" ] From f3d515e39e0a7d3e92686132b575e60e235330a9 Mon Sep 17 00:00:00 2001 From: Aaron Ritter Date: Sat, 18 Jan 2025 11:34:55 +0100 Subject: [PATCH 12/18] fix: downgrade to swift 6.0.2 - swift-actions/setup-swift@v2.2.0 Version "6.0.3" is not available --- .github/workflows/codeql-package.yml | 2 +- .github/workflows/codeql-samples-quickstart.yml | 2 +- .github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml | 2 +- .github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-package.yml b/.github/workflows/codeql-package.yml index 7a178c8..0b5666a 100644 --- a/.github/workflows/codeql-package.yml +++ b/.github/workflows/codeql-package.yml @@ -41,7 +41,7 @@ jobs: fail-fast: false matrix: # https://github.com/swiftlang/swift/releases - swift: ["6.0.3"] + swift: ["6.0.2"] # https://developer.apple.com/documentation/xcode-release-notes xcode: ["16.2"] language: [swift] diff --git a/.github/workflows/codeql-samples-quickstart.yml b/.github/workflows/codeql-samples-quickstart.yml index 8e8ae85..6b81110 100644 --- a/.github/workflows/codeql-samples-quickstart.yml +++ b/.github/workflows/codeql-samples-quickstart.yml @@ -41,7 +41,7 @@ jobs: fail-fast: false matrix: # https://github.com/swiftlang/swift/releases - swift: [ "6.0.3" ] + swift: [ "6.0.2" ] # https://developer.apple.com/documentation/xcode-release-notes xcode: [ "16.2" ] language: [ swift ] diff --git a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml index e1f2e4f..4c42300 100644 --- a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml +++ b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml @@ -40,7 +40,7 @@ jobs: xcode: [ "16.2" ] simulator-platform: [ "iOS" ] simulator-version: [ "18.1" ] - swift: [ "6.0.3" ] + swift: [ "6.0.2" ] os: [ "macos-14" ] postgresql-version: [ "16" ] include: diff --git a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml index 8ca85f0..cf4879f 100644 --- a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml +++ b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml @@ -35,7 +35,7 @@ jobs: xcode: [ "16.2" ] simulator-platform: [ "iOS" ] simulator-version: [ "18.1" ] - swift: [ "6.0.3" ] + swift: [ "6.0.2" ] os: [ "macos-14" ] postgresql-version: [ "16" ] fusionauth-docker-image-version: [ "1.51.2", "1.52.1", "1.53.3", "1.54.0", "1.55.1" ] From e58a16c1d964bad3f3d065ea17563ca5fda1c06b Mon Sep 17 00:00:00 2001 From: Aaron-Ritter Date: Tue, 21 Jan 2025 16:20:45 +0100 Subject: [PATCH 13/18] ci: update to macos-15 xcode 16.2 iOS-18.2 --- .github/workflows/codeql-package.yml | 2 +- .github/workflows/codeql-samples-quickstart.yml | 4 ++-- .../e2e-test-fusionauth-latest-ios-latest.yml | 10 +++++----- .../e2e-test-fusionauth-latest-ios-matrix.yml | 6 +++--- .../e2e-test-fusionauth-matrix-ios-latest.yml | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/codeql-package.yml b/.github/workflows/codeql-package.yml index 0b5666a..b68cd3c 100644 --- a/.github/workflows/codeql-package.yml +++ b/.github/workflows/codeql-package.yml @@ -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 diff --git a/.github/workflows/codeql-samples-quickstart.yml b/.github/workflows/codeql-samples-quickstart.yml index 6b81110..14c05f9 100644 --- a/.github/workflows/codeql-samples-quickstart.yml +++ b/.github/workflows/codeql-samples-quickstart.yml @@ -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 @@ -47,7 +47,7 @@ jobs: language: [ swift ] build-mode: [ manual ] destination: - - "platform=iOS Simulator,OS=18.1,name=iPhone 15" + - "platform=iOS Simulator,OS=18.2,name=iPhone 15" # 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 diff --git a/.github/workflows/e2e-test-fusionauth-latest-ios-latest.yml b/.github/workflows/e2e-test-fusionauth-latest-ios-latest.yml index 3b50e2a..99b542e 100644 --- a/.github/workflows/e2e-test-fusionauth-latest-ios-latest.yml +++ b/.github/workflows/e2e-test-fusionauth-latest-ios-latest.yml @@ -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 15" ] + 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 diff --git a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml index 4c42300..f2b51b3 100644 --- a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml +++ b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml @@ -36,12 +36,12 @@ jobs: strategy: fail-fast: false matrix: - destination: [ "platform=iOS Simulator,OS=18.1,name=iPhone 15" ] + destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 15" ] xcode: [ "16.2" ] simulator-platform: [ "iOS" ] - simulator-version: [ "18.1" ] + simulator-version: [ "18.2" ] swift: [ "6.0.2" ] - os: [ "macos-14" ] + os: [ "macos-15" ] postgresql-version: [ "16" ] include: - destination: "platform=iOS Simulator,OS=18.1,name=iPhone 15" diff --git a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml index cf4879f..1d5dfc1 100644 --- a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml +++ b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml @@ -31,12 +31,12 @@ jobs: strategy: fail-fast: false matrix: - destination: [ "platform=iOS Simulator,OS=18.1,name=iPhone 15" ] + destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 15" ] xcode: [ "16.2" ] simulator-platform: [ "iOS" ] - simulator-version: [ "18.1" ] + simulator-version: [ "18.2" ] swift: [ "6.0.2" ] - os: [ "macos-14" ] + 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" ] From f734d4aa5f5937eef3a650a7f6f7128b5a42205b Mon Sep 17 00:00:00 2001 From: Aaron-Ritter Date: Tue, 21 Jan 2025 16:30:02 +0100 Subject: [PATCH 14/18] ci: update to iPhone 16 --- .github/workflows/codeql-samples-quickstart.yml | 2 +- .github/workflows/e2e-test-fusionauth-latest-ios-latest.yml | 2 +- .github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml | 2 +- .github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-samples-quickstart.yml b/.github/workflows/codeql-samples-quickstart.yml index 14c05f9..cde5fbf 100644 --- a/.github/workflows/codeql-samples-quickstart.yml +++ b/.github/workflows/codeql-samples-quickstart.yml @@ -47,7 +47,7 @@ jobs: language: [ swift ] build-mode: [ manual ] destination: - - "platform=iOS Simulator,OS=18.2,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 diff --git a/.github/workflows/e2e-test-fusionauth-latest-ios-latest.yml b/.github/workflows/e2e-test-fusionauth-latest-ios-latest.yml index 99b542e..b378bd1 100644 --- a/.github/workflows/e2e-test-fusionauth-latest-ios-latest.yml +++ b/.github/workflows/e2e-test-fusionauth-latest-ios-latest.yml @@ -36,7 +36,7 @@ jobs: strategy: fail-fast: false matrix: - destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 15" ] + destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 16" ] xcode: [ "16.2" ] simulator-platform: [ "iOS" ] simulator-version: [ "18.2" ] diff --git a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml index f2b51b3..264b927 100644 --- a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml +++ b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml @@ -36,7 +36,7 @@ jobs: strategy: fail-fast: false matrix: - destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 15" ] + destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 16" ] xcode: [ "16.2" ] simulator-platform: [ "iOS" ] simulator-version: [ "18.2" ] diff --git a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml index 1d5dfc1..2662b71 100644 --- a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml +++ b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 15" ] + destination: [ "platform=iOS Simulator,OS=18.2,name=iPhone 16" ] xcode: [ "16.2" ] simulator-platform: [ "iOS" ] simulator-version: [ "18.2" ] From b8027d387255ba0f6bb40d111f2b1f3ad383810c Mon Sep 17 00:00:00 2001 From: Aaron-Ritter Date: Tue, 21 Jan 2025 16:53:17 +0100 Subject: [PATCH 15/18] refactor(quickstart): revert enable ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES --- .../project.pbxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj b/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj index 675172a..a686b69 100644 --- a/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj +++ b/Samples/Quickstart/fusionauth-quickstart-swift-ios-native.xcodeproj/project.pbxproj @@ -316,7 +316,6 @@ 0E2796012BD937BA00738892 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; @@ -380,7 +379,6 @@ 0E2796022BD937BA00738892 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; From 56f1d16b7e448ce0a0ebce64fcd1472deff06654 Mon Sep 17 00:00:00 2001 From: Colin Frick Date: Wed, 5 Feb 2025 15:58:56 +0100 Subject: [PATCH 16/18] ci: disable parallel testing --- .github/workflows/codeql-samples-quickstart.yml | 2 +- .github/workflows/e2e-test-fusionauth-latest-ios-latest.yml | 2 +- .github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml | 2 +- .github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-samples-quickstart.yml b/.github/workflows/codeql-samples-quickstart.yml index cde5fbf..123ecd1 100644 --- a/.github/workflows/codeql-samples-quickstart.yml +++ b/.github/workflows/codeql-samples-quickstart.yml @@ -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 diff --git a/.github/workflows/e2e-test-fusionauth-latest-ios-latest.yml b/.github/workflows/e2e-test-fusionauth-latest-ios-latest.yml index b378bd1..f853d85 100644 --- a/.github/workflows/e2e-test-fusionauth-latest-ios-latest.yml +++ b/.github/workflows/e2e-test-fusionauth-latest-ios-latest.yml @@ -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/upload-artifact@v4.6.0 diff --git a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml index 264b927..fb75b37 100644 --- a/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml +++ b/.github/workflows/e2e-test-fusionauth-latest-ios-matrix.yml @@ -213,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/upload-artifact@v4.6.0 diff --git a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml index 2662b71..b3b6d5e 100644 --- a/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml +++ b/.github/workflows/e2e-test-fusionauth-matrix-ios-latest.yml @@ -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/upload-artifact@v4.6.0 From 8f2dde350c4e42732c45fa4961b09eab6dde55b0 Mon Sep 17 00:00:00 2001 From: Colin Frick Date: Wed, 5 Feb 2025 16:29:36 +0100 Subject: [PATCH 17/18] test: submit login form by `return` key instead of submit button --- Samples/Quickstart/QuickstartTests/QuickstartTests.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Samples/Quickstart/QuickstartTests/QuickstartTests.swift b/Samples/Quickstart/QuickstartTests/QuickstartTests.swift index 26c6338..44f1a9f 100644 --- a/Samples/Quickstart/QuickstartTests/QuickstartTests.swift +++ b/Samples/Quickstart/QuickstartTests/QuickstartTests.swift @@ -56,8 +56,8 @@ final class QuickstartTests: XCTestCase { passwordField.tap() passwordField.typeText("password") - - submitButton.tap() + + passwordField.typeText("\n") // Check that Welcome message is displayed let welcomeText = app.staticTexts["Welcome Richard Hendricks"] From 34e9ccf0d37d70567faad8d5e902c4c145c6f629 Mon Sep 17 00:00:00 2001 From: Colin Frick Date: Wed, 5 Feb 2025 17:23:42 +0100 Subject: [PATCH 18/18] style: lint --- Samples/Quickstart/QuickstartTests/QuickstartTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Samples/Quickstart/QuickstartTests/QuickstartTests.swift b/Samples/Quickstart/QuickstartTests/QuickstartTests.swift index 44f1a9f..c61f571 100644 --- a/Samples/Quickstart/QuickstartTests/QuickstartTests.swift +++ b/Samples/Quickstart/QuickstartTests/QuickstartTests.swift @@ -56,7 +56,7 @@ final class QuickstartTests: XCTestCase { passwordField.tap() passwordField.typeText("password") - + passwordField.typeText("\n") // Check that Welcome message is displayed