diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 60f116c0..7958e8bd 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @auth0/dx-sdks-engineer +* @auth0/project-dx-sdks-engineer-codeowner diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 6b8c66d8..49ac73e5 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -15,13 +15,13 @@ runs: shell: bash - name: Set up Ruby - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 + uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # pin@v1.268.0 with: bundler-cache: true cache-version: 1 - name: Setup Xcode - uses: mxcl/xcodebuild@6e60022a0cbe8c89278be2dd1773a2f68e7c5c87 + uses: mxcl/xcodebuild@d3ee9b419c1be9a988086c58fe0988f32d99cfc5 # pin@v3.4.0 with: xcode: ${{ inputs.xcode }} action: none diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0be2e75b..7d7a6b7a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,10 +5,14 @@ on: - opened - synchronize +env: + ruby: '3.3.1' + jobs: test: name: Test using Xcode ${{ matrix.xcode }} - runs-on: macos-latest + runs-on: macos-14 + env: xcodeproj: Lock.xcodeproj @@ -17,7 +21,7 @@ jobs: strategy: matrix: xcode: - - '14.1' + - '16.1' steps: - name: Checkout @@ -47,12 +51,12 @@ jobs: pod-lint: name: Lint podspec using Xcode ${{ matrix.xcode }} - runs-on: macos-latest + runs-on: macos-14 strategy: matrix: xcode: - - '14.1' + - '16.1' steps: - name: Checkout @@ -72,12 +76,15 @@ jobs: swiftlint: name: Lint code with SwiftLint - runs-on: macos-latest + runs-on: macos-14 steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + - name: Install SwiftLint + run: brew install swiftlint + - name: Run SwiftLint run: swiftlint lint --reporter github-actions-logging diff --git a/Cartfile b/Cartfile index 54aba360..8e35fc33 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "auth0/Auth0.swift" ~> 1.31 +github "auth0/Auth0.swift" ~> 2.16.0 diff --git a/Cartfile.private b/Cartfile.private deleted file mode 100644 index 36ccb9fa..00000000 --- a/Cartfile.private +++ /dev/null @@ -1,4 +0,0 @@ -github "Quick/Quick" ~> 4.0 -github "Quick/Nimble" ~> 9.0 -github "AliSoftware/OHHTTPStubs" ~> 9.0 -github "emaloney/CleanroomLogger" ~> 7.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 49ac0a87..dd9eedbb 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,7 +1,3 @@ -github "AliSoftware/OHHTTPStubs" "9.1.0" -github "Quick/Nimble" "v9.2.1" -github "Quick/Quick" "v4.0.0" -github "auth0/Auth0.swift" "1.36.0" -github "auth0/JWTDecode.swift" "2.6.2" -github "auth0/SimpleKeychain" "0.12.4" -github "emaloney/CleanroomLogger" "7.0.0" +github "auth0/Auth0.swift" "2.16.1" +github "auth0/JWTDecode.swift" "3.3.0" +github "auth0/SimpleKeychain" "1.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index f6829c67..2dadd8cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -296,4 +296,4 @@ DEPENDENCIES slather BUNDLED WITH - 2.1.4 + 2.7.1 \ No newline at end of file diff --git a/Lock.xcodeproj/project.pbxproj b/Lock.xcodeproj/project.pbxproj index c573292d..c1dfbfde 100644 --- a/Lock.xcodeproj/project.pbxproj +++ b/Lock.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -1359,7 +1359,7 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = LockUITests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.3; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1382,7 +1382,7 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = LockUITests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.3; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1405,7 +1405,7 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = App/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1427,7 +1427,7 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = App/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1571,7 +1571,7 @@ FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build"; INFOPLIST_FILE = Lock/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1598,7 +1598,7 @@ FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build"; INFOPLIST_FILE = Lock/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1616,6 +1616,7 @@ buildSettings = { DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = LockTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1632,6 +1633,7 @@ buildSettings = { DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = LockTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/Lock/OfflineConnections.swift b/Lock/OfflineConnections.swift index ecd58d1a..dba4aa59 100644 --- a/Lock/OfflineConnections.swift +++ b/Lock/OfflineConnections.swift @@ -24,11 +24,11 @@ import Foundation struct OfflineConnections: ConnectionBuildable { - private (set) var databases: [DatabaseConnection] = [] + private(set) var databases: [DatabaseConnection] = [] var database: DatabaseConnection? { return self.databases.first } - private (set) var oauth2: [OAuth2Connection] = [] - private (set) var enterprise: [EnterpriseConnection] = [] - private (set) var passwordless: [PasswordlessConnection] = [] + private(set) var oauth2: [OAuth2Connection] = [] + private(set) var enterprise: [EnterpriseConnection] = [] + private(set) var passwordless: [PasswordlessConnection] = [] mutating func database(name: String, requiresUsername: Bool, usernameValidator: UsernameValidator = UsernameValidator(), passwordValidator: PasswordPolicyValidator) { self.databases.append(DatabaseConnection(name: name, requiresUsername: requiresUsername, usernameValidator: usernameValidator, passwordValidator: passwordValidator))