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

Update Quick and Nimble to latest major #183

Merged
merged 2 commits into from
May 10, 2023
Merged

Update Quick and Nimble to latest major #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b5f1fa
Update Quick and Nimble to latest major
Widcket May 6, 2023
f99a946
Exclude watchOS from `pod lib lint` due to Cocoapods bug
Widcket May 6, 2023
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,4 @@ workflows:
matrix:
parameters:
platform: [ios, macos, tvos]
xcode: ["13.0.0"]
xcode: ['14.2.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,2 +1,2 @@
github "Quick/Quick" ~> 5.0
github "Quick/Nimble" ~> 10.0
github "Quick/Quick" ~> 6.0
github "Quick/Nimble" ~> 12.0
4 changes: 2 additions & 2 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Quick/Nimble" "v10.0.0"
github "Quick/Quick" "v5.0.1"
github "Quick/Nimble" "v12.0.0"
github "Quick/Quick" "v6.1.0"
4 changes: 2 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ let package = Package(
platforms: [.iOS(.v12), .macOS(.v10_15), .tvOS(.v12), .watchOS("6.2")],
products: [.library(name: "SimpleKeychain", targets: ["SimpleKeychain"])],
dependencies: [
.package(name: "Quick", url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "5.0.0")),
.package(name: "Nimble", url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "10.0.0"))
.package(name: "Quick", url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "6.0.0")),
.package(name: "Nimble", url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "12.0.0"))
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion SimpleKeychainTests/SimpleKeychainSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class SimpleKeychainSpec: QuickSpec {
return errSecSuccess
}
try sut.deleteAll()
expect(limit).toEventually(beNil())
await expect(limit).toEventually(beNil())
}
#endif
}
Expand Down
2 changes: 1 addition & 1 deletion fastlane/Fastfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ platform :ios do

desc 'Cocoapods library lint'
lane :pod_lint do
pod_lib_lint(verbose: false, allow_warnings: true)
pod_lib_lint(verbose: false, allow_warnings: true, platforms: 'ios,osx,tvos')
end

desc 'Runs all the tests in a CI environment'
Expand Down