Updated Quick and Nimble (#421)

* Updated Quick and Nimble * Update CircleCI config * Update gems * Add notice to the README * Add Swift 5.3 to the Podspec
auth0 · Oct 7, 2020 · 96e3981 · 96e3981
1 parent 448db4c
commit 96e3981
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 220 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,20 +1,23 @@
 version: 2
 jobs:
-  build-iOS-Swift-5.1:
+  build-iOS-Swift-5.2:
     macos:
-      xcode: "11.2.0"
+      xcode: "11.7.0"
     shell: /bin/bash --login -eo pipefail
     environment:
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
           HOMEBREW_LOGS: ~/homebrew-logs
           HOMEBREW_TEMP: ~/homebrew-temp
           HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
       - checkout
       - run: |
+          echo "ruby-2.7.1p83" > ~/.ruby-version
           brew install swiftlint
-          bundle install --without=development
+          bundle check || bundle install --without=development
           grep -lR "shouldUseLaunchSchemeArgsEnv" *.* --null | xargs -0 sed -i '' -e 's/shouldUseLaunchSchemeArgsEnv = "YES"/shouldUseLaunchSchemeArgsEnv = "YES" codeCoverageEnabled = "YES"/g'
       - run:
           name: Bootstrap
@@ -24,7 +27,7 @@ jobs:
           command: bundle exec fastlane ios ci
           environment:
             SCHEME: Auth0.iOS
-            DEVICE: iPhone 8
+            DEVICE: iPhone 11
             FASTLANE_EXPLICIT_OPEN_SIMULATOR: 2
       - run: 
           name: Run pod lib lint
@@ -41,113 +44,23 @@ jobs:
             - Carthage/Build
       - store_artifacts:
           path: /tmp/artifacts
-  build-iOS-Swift-5.0:
+  build-macOS-Swift-5.2:
     macos:
-      xcode: "10.3.0"
+      xcode: "11.7.0"
     environment:
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
           HOMEBREW_LOGS: ~/homebrew-logs
           HOMEBREW_TEMP: ~/homebrew-temp
           HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
       - checkout
       - run: |
-          echo "ruby-2.6" > ~/.ruby-version
+          echo "ruby-2.7.1p83" > ~/.ruby-version
           brew install swiftlint
-          bundle install --without=development
-          grep -lR "shouldUseLaunchSchemeArgsEnv" *.* --null | xargs -0 sed -i '' -e 's/shouldUseLaunchSchemeArgsEnv = "YES"/shouldUseLaunchSchemeArgsEnv = "YES" codeCoverageEnabled = "YES"/g'
-      - run:
-          name: Bootstrap
-          command: bundle exec fastlane ios bootstrap
-      - run:
-          name: Run test suite
-          command: bundle exec fastlane ios ci
-          environment:
-            SCHEME: Auth0.iOS
-            DEVICE: iPhone 8
-            FASTLANE_EXPLICIT_OPEN_SIMULATOR: 2
-      - save_cache:
-          key: dependency-cache
-          paths:
-            - Carthage/Build
-  build-iOS-Swift-4.2:
-    macos:
-      xcode: "10.3.0"
-    environment:
-          LC_ALL: en_US.UTF-8
-          LANG: en_US.UTF-8
-          HOMEBREW_LOGS: ~/homebrew-logs
-          HOMEBREW_TEMP: ~/homebrew-temp
-          HOMEBREW_NO_AUTO_UPDATE: 1
-    steps:
-      - checkout
-      - run: |
-          echo "ruby-2.6" > ~/.ruby-version
-          brew install swiftlint
-          bundle install --without=development
-          grep -lR "shouldUseLaunchSchemeArgsEnv" *.* --null | xargs -0 sed -i '' -e 's/shouldUseLaunchSchemeArgsEnv = "YES"/shouldUseLaunchSchemeArgsEnv = "YES" codeCoverageEnabled = "YES"/g'
-          sed -i "" 's/SWIFT_VERSION = 5.0/SWIFT_VERSION = 4.2/g' "Auth0.xcodeproj/project.pbxproj"
-      - run:
-          name: Bootstrap
-          command: bundle exec fastlane ios bootstrap
-      - run:
-          name: Run test suite
-          command: bundle exec fastlane ios ci
-          environment:
-            SCHEME: Auth0.iOS
-            DEVICE: iPhone 8
-            FASTLANE_EXPLICIT_OPEN_SIMULATOR: 2
-      - save_cache:
-          key: dependency-cache
-          paths:
-            - Carthage/Build
-  build-iOS-Swift-4.0:
-    macos:
-      xcode: "10.3.0"
-    environment:
-          LC_ALL: en_US.UTF-8
-          LANG: en_US.UTF-8
-          HOMEBREW_LOGS: ~/homebrew-logs
-          HOMEBREW_TEMP: ~/homebrew-temp
-          HOMEBREW_NO_AUTO_UPDATE: 1
-    steps:
-      - checkout
-      - run: |
-          echo "ruby-2.6" > ~/.ruby-version
-          brew install swiftlint
-          bundle install --without=development
-          grep -lR "shouldUseLaunchSchemeArgsEnv" *.* --null | xargs -0 sed -i '' -e 's/shouldUseLaunchSchemeArgsEnv = "YES"/shouldUseLaunchSchemeArgsEnv = "YES" codeCoverageEnabled = "YES"/g'
-          sed -i "" 's/SWIFT_VERSION = 5.0/SWIFT_VERSION = 4.0/g' "Auth0.xcodeproj/project.pbxproj"
-      - run:
-          name: Bootstrap
-          command: bundle exec fastlane ios bootstrap
-      - run:
-          name: Run test suite
-          command: bundle exec fastlane ios ci
-          environment:
-            SCHEME: Auth0.iOS
-            DEVICE: iPhone 8
-            FASTLANE_EXPLICIT_OPEN_SIMULATOR: 2
-      - save_cache:
-          key: dependency-cache
-          paths:
-            - Carthage/Build
-  build-macOS-Swift-5.0:
-    macos:
-      xcode: "10.3.0"
-    environment:
-          LC_ALL: en_US.UTF-8
-          LANG: en_US.UTF-8
-          HOMEBREW_LOGS: ~/homebrew-logs
-          HOMEBREW_TEMP: ~/homebrew-temp
-          HOMEBREW_NO_AUTO_UPDATE: 1
-    steps:
-      - checkout
-      - run: |
-          echo "ruby-2.6" > ~/.ruby-version
-          brew install swiftlint
-          bundle install --without=development
+          bundle check || bundle install --without=development
           grep -lR "shouldUseLaunchSchemeArgsEnv" *.* --null | xargs -0 sed -i '' -e 's/shouldUseLaunchSchemeArgsEnv = "YES"/shouldUseLaunchSchemeArgsEnv = "YES" codeCoverageEnabled = "YES"/g'
       - run:
           name: Bootstrap
@@ -166,83 +79,24 @@ jobs:
           key: dependency-cache
           paths:
             - Carthage/Build
-  build-macOS-Swift-4.2:
-    macos:
-      xcode: "10.3.0"
-    environment:
-          LC_ALL: en_US.UTF-8
-          LANG: en_US.UTF-8
-          HOMEBREW_LOGS: ~/homebrew-logs
-          HOMEBREW_TEMP: ~/homebrew-temp
-          HOMEBREW_NO_AUTO_UPDATE: 1
-    steps:
-      - checkout
-      - run: |
-          echo "ruby-2.6" > ~/.ruby-version
-          brew install swiftlint
-          bundle install --without=development
-          grep -lR "shouldUseLaunchSchemeArgsEnv" *.* --null | xargs -0 sed -i '' -e 's/shouldUseLaunchSchemeArgsEnv = "YES"/shouldUseLaunchSchemeArgsEnv = "YES" codeCoverageEnabled = "YES"/g'
-          sed -i "" 's/SWIFT_VERSION = 5.0/SWIFT_VERSION = 4.2/g' "Auth0.xcodeproj/project.pbxproj"
-      - run:
-          name: Bootstrap
-          command: carthage bootstrap --platform mac
-      - run: 
-          name: Setup Keychain
-          command: |
-            security create-keychain -p circle cikeychain
-            security list-keychains -d user -s "/Users/distiller/Library/Keychains/xcode.keychain-db" /Users/distiller/Library/Keychains/cikeychain-db
-            security default-keychain -s /Users/distiller/Library/Keychains/cikeychain-db
-            security unlock-keychain -p circle "/Users/distiller/Library/Keychains/cikeychain-db"
-      - run:
-          name: Run test suite
-          command: xcodebuild test -scheme Auth0.macOS -destination 'platform=macOS,arch=x86_64' | xcpretty
-      - save_cache:
-          key: dependency-cache
-          paths:
-            - Carthage/Build
-  build-tvOS-Swift-5.0:
-    macos:
-      xcode: "10.3.0"
-    environment:
-          LC_ALL: en_US.UTF-8
-          LANG: en_US.UTF-8
-          HOMEBREW_LOGS: ~/homebrew-logs
-          HOMEBREW_TEMP: ~/homebrew-temp
-          HOMEBREW_NO_AUTO_UPDATE: 1
-    steps:
-      - checkout
-      - run: |
-          echo "ruby-2.6" > ~/.ruby-version
-          brew install swiftlint
-          bundle install --without=development
-          grep -lR "shouldUseLaunchSchemeArgsEnv" *.* --null | xargs -0 sed -i '' -e 's/shouldUseLaunchSchemeArgsEnv = "YES"/shouldUseLaunchSchemeArgsEnv = "YES" codeCoverageEnabled = "YES"/g'
-      - run:
-          name: Bootstrap
-          command: carthage bootstrap --platform tvOS
-      - run:
-          name: Run test suite
-          command: xcodebuild test -scheme Auth0.tvOS -destination 'platform=tvOS Simulator,name=Apple TV' | xcpretty
-      - save_cache:
-          key: dependency-cache
-          paths:
-            - Carthage/Build
-  build-tvOS-Swift-4.2:
+  build-tvOS-Swift-5.2:
     macos:
-      xcode: "10.3.0"
+      xcode: "11.7.0"
     environment:
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
           HOMEBREW_LOGS: ~/homebrew-logs
           HOMEBREW_TEMP: ~/homebrew-temp
           HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
       - checkout
       - run: |
-          echo "ruby-2.6" > ~/.ruby-version
+          echo "ruby-2.7.1p83" > ~/.ruby-version
           brew install swiftlint
-          bundle install --without=development
+          bundle check || bundle install --without=development
           grep -lR "shouldUseLaunchSchemeArgsEnv" *.* --null | xargs -0 sed -i '' -e 's/shouldUseLaunchSchemeArgsEnv = "YES"/shouldUseLaunchSchemeArgsEnv = "YES" codeCoverageEnabled = "YES"/g'
-          sed -i "" 's/SWIFT_VERSION = 5.0/SWIFT_VERSION = 4.2/g' "Auth0.xcodeproj/project.pbxproj"
       - run:
           name: Bootstrap
           command: carthage bootstrap --platform tvOS
@@ -258,11 +112,6 @@ workflows:
   version: 2
   build:
     jobs:
-      -  build-iOS-Swift-5.1
-      -  build-iOS-Swift-5.0
-      -  build-iOS-Swift-4.2
-      -  build-iOS-Swift-4.0
-      -  build-macOS-Swift-5.0
-      -  build-macOS-Swift-4.2
-      -  build-tvOS-Swift-5.0
-      -  build-tvOS-Swift-4.2
+      -  build-iOS-Swift-5.2
+      -  build-macOS-Swift-5.2
+      -  build-tvOS-Swift-5.2
diff --git a/Auth0.podspec b/Auth0.podspec
@@ -103,5 +103,5 @@ Pod::Spec.new do |s|
   s.tvos.dependency 'SimpleKeychain'
   s.tvos.dependency 'JWTDecode'
 
-  s.swift_versions = ['4.0', '4.1', '4.2', '5.0', '5.1', '5.2']
+  s.swift_versions = ['4.0', '4.1', '4.2', '5.0', '5.1', '5.2', '5.3']
 end
diff --git a/Auth0Tests/AuthenticationSpec.swift b/Auth0Tests/AuthenticationSpec.swift
@@ -37,7 +37,7 @@ private let AccessToken = UUID().uuidString.replacingOccurrences(of: "-", with:
 private let IdToken = UUID().uuidString.replacingOccurrences(of: "-", with: "")
 private let FacebookToken = UUID().uuidString.replacingOccurrences(of: "-", with: "")
 private let InvalidFacebookToken = UUID().uuidString.replacingOccurrences(of: "-", with: "")
-private let Timeout: TimeInterval = 2
+private let Timeout: DispatchTimeInterval = .seconds(2)
 private let TokenExchangeGrantType = "urn:ietf:params:oauth:grant-type:token-exchange"
 private let PasswordlessGrantType = "http://auth0.com/oauth/grant-type/passwordless/otp"