Skip to content
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

Jump to bottom

Updated Quick and Nimble #641

Merged
merged 5 commits into from
Oct 22, 2020
Merged

Updated Quick and Nimble #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
163ff20
Update Quick and Nimble
Widcket Oct 20, 2020
3ba0c5f
Update CI config
Widcket Oct 20, 2020
24ba1d5
Replace int timeout with DispatchTimeInterval
Widcket Oct 20, 2020
e6c8504
Remove redundant equatable implementation
Widcket Oct 20, 2020
4561823
Remove the FOSSA badge and widget
Widcket Oct 21, 2020
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
46 changes: 3 additions & 43 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,14 @@ executors:
FASTLANE_EXPLICIT_OPEN_SIMULATOR: 2

commands:
use-swift:
parameters:
version:
type: string
steps:
- run: sed -i "" 's/SWIFT_VERSION = 5.0/SWIFT_VERSION = << parameters.version >>/g' "Lock.xcodeproj/project.pbxproj"
prepare:
parameters:
ruby:
type: string
default: "2.6.3"
default: "2.7.1p83"
xcode:
type: string
default: "10.3.0"
default: "11.7.0"
steps:
- restore_cache:
keys:
Expand All @@ -56,7 +50,6 @@ commands:
key: lock-swift-carthage-{ checksum "Cartfile.resolved" }}-<< parameters.xcode >>
paths:
- Carthage/Build

test:
steps:
- run: bundle exec fastlane ios ci
Expand All @@ -74,49 +67,16 @@ jobs:
xcode: 11.7.0
steps:
- checkout
- prepare:
ruby: "2.7.1p83"
xcode: "11.7.0"
- prepare
- test
- send-coverage-report
- pod-lint
- store_test_results:
path: output/scan
- store_artifacts:
path: output
build-and-test-swift-5_0:
executor: job-environment
macos:
xcode: 10.3.0
steps:
- checkout
- prepare
- test
build-and-test-swift-4_2:
executor: job-environment
macos:
xcode: 10.3.0
steps:
- checkout
- use-swift:
version: "4.2"
- prepare
- test
build-and-test-swift-4_0:
executor: job-environment
macos:
xcode: 10.3.0
steps:
- checkout
- use-swift:
version: "4.0"
- prepare
- test

workflows:
build:
jobs:
- build-and-test-swift-5_2
- build-and-test-swift-5_0
- build-and-test-swift-4_2
- build-and-test-swift-4_0
2 changes: 1 addition & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "auth0/Auth0.swift"
github "auth0/Auth0.swift" ~> 1.0
4 changes: 2 additions & 2 deletions Cartfile.private
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Quick/Quick" ~> 2.2
github "Quick/Nimble" ~> 8.0
github "Quick/Quick" ~> 3.0
github "Quick/Nimble" ~> 9.0
github "AliSoftware/OHHTTPStubs" ~> 9.0
github "emaloney/CleanroomLogger" ~> 7.0
10 changes: 5 additions & 5 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "AliSoftware/OHHTTPStubs" "9.0.0"
github "Quick/Nimble" "v8.0.9"
github "Quick/Quick" "v2.2.0"
github "auth0/Auth0.swift" "1.28.0"
github "auth0/JWTDecode.swift" "2.4.1"
github "auth0/SimpleKeychain" "0.11.1"
github "Quick/Nimble" "v9.0.0"
github "Quick/Quick" "v3.0.0"
github "auth0/Auth0.swift" "1.29.0"
github "auth0/JWTDecode.swift" "2.5.0"
github "auth0/SimpleKeychain" "0.12.1"
github "emaloney/CleanroomLogger" "7.0.0"
14 changes: 8 additions & 6 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
aws-eventstream (1.1.0)
aws-partitions (1.381.0)
aws-partitions (1.383.0)
aws-sdk-core (3.109.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
Expand All @@ -23,7 +23,7 @@ GEM
aws-sdk-kms (1.39.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.83.0)
aws-sdk-s3 (1.83.1)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
Expand Down Expand Up @@ -84,16 +84,17 @@ GEM
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
excon (0.76.0)
faraday (1.0.1)
excon (0.78.0)
faraday (1.1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
fastimage (2.2.0)
fastlane (2.162.0)
fastlane (2.164.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
aws-sdk-s3 (~> 1.0)
Expand Down Expand Up @@ -146,7 +147,7 @@ GEM
google-cloud-core (1.5.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.3.3)
google-cloud-env (1.4.0)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.0.1)
google-cloud-storage (1.29.1)
Expand Down Expand Up @@ -194,6 +195,7 @@ GEM
retriable (3.1.2)
rouge (2.0.7)
ruby-macho (1.4.0)
ruby2_keywords (0.0.2)
rubyzip (2.3.0)
security (0.1.3)
semantic (1.6.1)
Expand Down
2 changes: 1 addition & 1 deletion Lock.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ Auth0 is a SaaS that helps you with Authentication and Authorization. You can us
classic.ios.resource = ["Lock/*.xcassets", "Lock/*.lproj", "Lock/passwordless_country_codes.plist"]
end

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
23 changes: 0 additions & 23 deletions LockTests/CredentialAuthErrorSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,26 +92,3 @@ class CredentialAuthErrorSpec: QuickSpec {

}
}

extension CredentialAuthError: Equatable {
public static func ==(lhs: CredentialAuthError, rhs: CredentialAuthError) -> Bool {
switch (lhs, rhs) {
case (.nonValidInput, .nonValidInput),
(.userBlocked, .userBlocked),
(.invalidEmailPassword, .invalidEmailPassword),
(.couldNotLogin, .couldNotLogin),
(.passwordChangeRequired, .passwordChangeRequired),
(.passwordLeaked, .passwordLeaked),
(.tooManyAttempts, .tooManyAttempts),
(.multifactorRequired, .multifactorRequired),
(.multifactorInvalid, .multifactorInvalid):
return true
case (.customRuleFailure(let lhsCause), .customRuleFailure(let rhsCause)):
return lhsCause == rhsCause
case (.multifactorTokenRequired(let lhsToken), .multifactorTokenRequired(let rhsToken)):
return lhsToken == rhsToken
default:
return false
}
}
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was producing a warning, as CredentialAuthError already implements Equatable in the library code. See https://github.com/auth0/Lock.swift/blob/master/Lock/CredentialAuthError.swift#L74

2 changes: 1 addition & 1 deletion LockTests/Interactors/Auth0OAuth2InteractorSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import Auth0
@testable import Lock

private let DomainURL = URL(fileURLWithPath: domain)
private let Timeout = 2.0
private let Timeout = DispatchTimeInterval.seconds(2)
private let AccessToken = UUID().uuidString.replacingOccurrences(of: "-", with: "")
private let IdToken = UUID().uuidString.replacingOccurrences(of: "-", with: "")
private let FacebookToken = UUID().uuidString.replacingOccurrences(of: "-", with: "")
Expand Down
Loading