Skip to content

Commit

Permalink
Update Quick to 2.0.0 and Nimble to 8.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ikesyo committed Mar 4, 2019
1 parent aa9e36b commit 9d6a3e2
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Cartfile.private
@@ -1,3 +1,3 @@
github "jspahrsummers/xcconfigs" == 0.12
github "Quick/Quick" ~> 1.3.4
github "Quick/Nimble" ~> 7.3.3
github "Quick/Quick" ~> 2.0.0
github "Quick/Nimble" ~> 8.0.0
4 changes: 2 additions & 2 deletions Cartfile.resolved
@@ -1,4 +1,4 @@
github "Quick/Nimble" "v7.3.3"
github "Quick/Quick" "v1.3.4"
github "Quick/Nimble" "v8.0.0"
github "Quick/Quick" "v2.0.0"
github "antitypical/Result" "4.1.0"
github "jspahrsummers/xcconfigs" "0.12"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 97 files
+1 −1 .swift-version
+16 −4 .swiftlint.yml
+24 −53 .travis.yml
+1 −1 Gemfile
+24 −24 Gemfile.lock
+4 −1 Nimble.podspec
+24 −4 Nimble.xcodeproj/project.pbxproj
+8 −0 Nimble.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+16 −6 Package.swift
+0 −22 Package@swift-4.swift
+7 −22 README.md
+1 −0 Sources/Nimble/Adapters/AdapterProtocols.swift
+30 −3 Sources/Nimble/Adapters/AssertionRecorder.swift
+5 −1 Sources/Nimble/Adapters/NMBExpectation.swift
+3 −1 Sources/Nimble/Adapters/NMBObjCMatcher.swift
+2 −7 Sources/Nimble/Adapters/NimbleEnvironment.swift
+6 −7 Sources/Nimble/Adapters/NimbleXCTestHandler.swift
+1 −1 Sources/Nimble/Adapters/NonObjectiveC/ExceptionCapture.swift
+10 −4 Sources/Nimble/DSL+Wait.swift
+11 −7 Sources/Nimble/DSL.swift
+16 −13 Sources/Nimble/ExpectationMessage.swift
+2 −0 Sources/Nimble/Expression.swift
+1 −0 Sources/Nimble/FailureMessage.swift
+2 −1 Sources/Nimble/Matchers/AllPass.swift
+4 −2 Sources/Nimble/Matchers/Async.swift
+1 −1 Sources/Nimble/Matchers/BeAKindOf.swift
+2 −2 Sources/Nimble/Matchers/BeAnInstanceOf.swift
+8 −1 Sources/Nimble/Matchers/BeCloseTo.swift
+12 −1 Sources/Nimble/Matchers/BeEmpty.swift
+4 −4 Sources/Nimble/Matchers/BeGreaterThan.swift
+4 −4 Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift
+8 −32 Sources/Nimble/Matchers/BeIdenticalTo.swift
+4 −4 Sources/Nimble/Matchers/BeLessThan.swift
+4 −4 Sources/Nimble/Matchers/BeLessThanOrEqual.swift
+17 −30 Sources/Nimble/Matchers/BeLogical.swift
+4 −4 Sources/Nimble/Matchers/BeNil.swift
+7 −5 Sources/Nimble/Matchers/BeVoid.swift
+8 −8 Sources/Nimble/Matchers/BeginWith.swift
+46 −17 Sources/Nimble/Matchers/Contain.swift
+13 −13 Sources/Nimble/Matchers/ContainElementSatisfying.swift
+16 −0 Sources/Nimble/Matchers/ElementsEqual.swift
+7 −6 Sources/Nimble/Matchers/EndWith.swift
+42 −114 Sources/Nimble/Matchers/Equal.swift
+18 −9 Sources/Nimble/Matchers/HaveCount.swift
+1 −1 Sources/Nimble/Matchers/Match.swift
+8 −5 Sources/Nimble/Matchers/MatcherProtocols.swift
+5 −32 Sources/Nimble/Matchers/PostNotification.swift
+2 −1 Sources/Nimble/Matchers/Predicate.swift
+9 −3 Sources/Nimble/Matchers/RaisesException.swift
+7 −3 Sources/Nimble/Matchers/SatisfyAllOf.swift
+7 −3 Sources/Nimble/Matchers/SatisfyAnyOf.swift
+3 −4 Sources/Nimble/Matchers/ThrowAssertion.swift
+13 −19 Sources/Nimble/Utils/Await.swift
+4 −2 Sources/Nimble/Utils/Functional.swift
+4 −15 Sources/Nimble/Utils/Stringers.swift
+4 −33 Tests/LinuxMain.swift
+15 −53 Tests/NimbleTests/AsynchronousTest.swift
+15 −5 Tests/NimbleTests/Helpers/XCTestCaseProvider.swift
+7 −2 Tests/NimbleTests/Helpers/utils.swift
+0 −11 Tests/NimbleTests/Matchers/AllPassTest.swift
+4 −18 Tests/NimbleTests/Matchers/BeAKindOfTest.swift
+0 −9 Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift
+18 −36 Tests/NimbleTests/Matchers/BeCloseToTest.swift
+49 −14 Tests/NimbleTests/Matchers/BeEmptyTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeGreaterThanTest.swift
+0 −11 Tests/NimbleTests/Matchers/BeIdenticalToObjectTest.swift
+0 −11 Tests/NimbleTests/Matchers/BeIdenticalToTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeLessThanOrEqualToTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeLessThanTest.swift
+0 −38 Tests/NimbleTests/Matchers/BeLogicalTest.swift
+0 −6 Tests/NimbleTests/Matchers/BeNilTest.swift
+0 −6 Tests/NimbleTests/Matchers/BeVoidTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeginWithTest.swift
+0 −14 Tests/NimbleTests/Matchers/ContainElementSatisfyingTest.swift
+41 −12 Tests/NimbleTests/Matchers/ContainTest.swift
+27 −0 Tests/NimbleTests/Matchers/ElementsEqualTest.swift
+0 −7 Tests/NimbleTests/Matchers/EndWithTest.swift
+1 −18 Tests/NimbleTests/Matchers/EqualTest.swift
+39 −20 Tests/NimbleTests/Matchers/HaveCountTest.swift
+4 −12 Tests/NimbleTests/Matchers/MatchErrorTest.swift
+0 −10 Tests/NimbleTests/Matchers/MatchTest.swift
+0 −12 Tests/NimbleTests/Matchers/PostNotificationTest.swift
+1 −11 Tests/NimbleTests/Matchers/RaisesExceptionTest.swift
+0 −7 Tests/NimbleTests/Matchers/SatisfyAllOfTest.swift
+0 −7 Tests/NimbleTests/Matchers/SatisfyAnyOfTest.swift
+1 −12 Tests/NimbleTests/Matchers/ThrowAssertionTest.swift
+2 −12 Tests/NimbleTests/Matchers/ThrowErrorTest.swift
+0 −6 Tests/NimbleTests/Matchers/ToSucceedTest.swift
+0 −19 Tests/NimbleTests/SynchronousTest.swift
+36 −29 Tests/NimbleTests/UserDescriptionTest.swift
+386 −0 Tests/NimbleTests/XCTestManifests.swift
+5 −0 Tests/NimbleTests/objc/ObjCAsyncTest.m
+9 −0 Tests/NimbleTests/objc/ObjCContainTest.m
+0 −1 Tests/NimbleTests/objc/ObjCEndWithTest.m
+9 −0 Tests/NimbleTests/objc/ObjCHaveCountTest.m
+7 −3 test
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 48 files
+3 −1 .hound.yml
+1 −1 .swift-version
+40 −44 .travis.yml
+2 −2 Dangerfile
+1 −1 Documentation/en-us/SharedExamples.md
+1 −1 Documentation/ko-kr/BehavioralTesting.md
+1 −1 Documentation/ko-kr/InstallingQuick.md
+1 −1 Externals/Nimble
+1 −1 Gemfile
+26 −26 Gemfile.lock
+2 −2 Package.resolved
+30 −37 Package.swift
+0 −40 Package@swift-4.swift
+1 −1 Quick Templates/Quick Configuration Class.xctemplate/Objective-C/___FILEBASENAME___.h
+1 −1 Quick Templates/Quick Configuration Class.xctemplate/Objective-C/___FILEBASENAME___.m
+1 −1 Quick Templates/Quick Configuration Class.xctemplate/Swift/___FILEBASENAME___.swift
+1 −1 Quick Templates/Quick Spec Class.xctemplate/Objective-C/___FILEBASENAME___.m
+1 −1 Quick Templates/Quick Spec Class.xctemplate/Swift/___FILEBASENAME___.swift
+5 −2 Quick.podspec
+6 −6 Quick.xcodeproj/project.pbxproj
+8 −0 Quick.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+3 −1 README.md
+9 −6 Rakefile
+3 −9 Sources/Quick/Callsite.swift
+2 −2 Sources/Quick/Configuration/Configuration.swift
+1 −1 Sources/Quick/Configuration/QuickConfiguration.swift
+3 −3 Sources/Quick/DSL/World+DSL.swift
+1 −1 Sources/Quick/ErrorUtility.swift
+3 −9 Sources/Quick/Example.swift
+3 −9 Sources/Quick/ExampleMetadata.swift
+3 −9 Sources/Quick/Filter.swift
+1 −1 Sources/Quick/NSBundle+CurrentTestBundle.swift
+2 −2 Sources/Quick/NSString+C99ExtendedIdentifier.swift
+2 −2 Sources/Quick/QuickMain.swift
+1 −1 Sources/Quick/QuickSelectedTestSuiteBuilder.swift
+2 −10 Sources/Quick/QuickSpec.swift
+1 −1 Sources/Quick/QuickTestSuite.swift
+5 −11 Sources/Quick/World.swift
+1 −1 Tests/QuickTests/QuickTestHelpers/XCTestCaseProvider.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/AfterEachTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/BeforeEachTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/BehaviorTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/ContextTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/DescribeTests.swift
+2 −2 Tests/QuickTests/QuickTests/FunctionalTests/ItTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/SharedExamplesTests.swift
+1 −1 script/release
+0 −4 script/travis-install-macos
8 changes: 4 additions & 4 deletions Package.resolved
Expand Up @@ -6,17 +6,17 @@
"repositoryURL": "https://github.com/Quick/Nimble.git",
"state": {
"branch": null,
"revision": "9a281b1cfa1c53d1e8bd92e1798e4e473af8d263",
"version": "7.3.3"
"revision": "a27c5186ce2d65f60d1237660b2509df3eb29023",
"version": "8.0.0"
}
},
{
"package": "Quick",
"repositoryURL": "https://github.com/Quick/Quick.git",
"state": {
"branch": null,
"revision": "f2b5a06440ea87eba1a167cab37bf6496646c52e",
"version": "1.3.4"
"revision": "0b4ed6c706dd0cce923b5019a605a9bcc6b1b600",
"version": "2.0.0"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Expand Up @@ -8,8 +8,8 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/antitypical/Result.git", from: "4.1.0"),
.package(url: "https://github.com/Quick/Quick.git", from: "1.3.4"),
.package(url: "https://github.com/Quick/Nimble.git", from: "7.3.3"),
.package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
.package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"),
],
targets: [
.target(name: "ReactiveSwift", dependencies: ["Result"], path: "Sources"),
Expand Down
4 changes: 2 additions & 2 deletions Package@swift-4.2.swift
Expand Up @@ -8,8 +8,8 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/antitypical/Result.git", from: "4.1.0"),
.package(url: "https://github.com/Quick/Quick.git", from: "1.3.4"),
.package(url: "https://github.com/Quick/Nimble.git", from: "7.3.3"),
.package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
.package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"),
],
targets: [
.target(name: "ReactiveSwift", dependencies: ["Result"], path: "Sources"),
Expand Down

0 comments on commit 9d6a3e2

Please sign in to comment.