Merge pull request #156 from jakovi89/swift-4.2

Updated Quick and Nimble (Swift 4.2+ support)
ReactiveCocoa · Apr 1, 2019 · 27a7254 · 27a7254
2 parents b62aa6f + 327bdb7
commit 27a7254
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10
+osx_image: xcode10.2
 before_install: true
 install: true
 branches:

diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" "3d9d996"
-github "Quick/Quick" ~> 1.2
-github "Quick/Nimble" ~> 7.0.2
+github "Quick/Quick" ~> 2.0
+github "Quick/Nimble" ~> 8.0.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v7.3.1"
-github "Quick/Quick" "v1.2.0"
+github "Quick/Nimble" "v8.0.1"
+github "Quick/Quick" "v2.0.0"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
diff --git a/ReactiveObjC.xcodeproj/project.pbxproj b/ReactiveObjC.xcodeproj/project.pbxproj
@@ -1988,6 +1988,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = D04725E019E49ED7006002AA;
@@ -2905,6 +2906,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = ReactiveObjCTests/Info.plist;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_NAME = "$(PROJECT_NAME)Tests";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.2;
@@ -2922,6 +2924,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = ReactiveObjCTests/Info.plist;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_NAME = "$(PROJECT_NAME)Tests";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.2;
@@ -3037,6 +3040,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = ReactiveObjCTests/Info.plist;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_NAME = "$(PROJECT_NAME)Tests";
 				SWIFT_VERSION = 4.2;
 			};
@@ -3078,7 +3082,7 @@
 				CODE_SIGNING_REQUIRED = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)-Tests";
 				PRODUCT_NAME = "$(PROJECT_NAME)";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -3120,6 +3124,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = ReactiveObjCTests/Info.plist;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_NAME = "$(PROJECT_NAME)Tests";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.2;
+1 −1		.swift-version
+16 −4		.swiftlint.yml
+28 −27		.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
+8 −10		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
+10 −4		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
+25 −4		Sources/Nimble/Matchers/BeEmpty.swift
+4 −4		Sources/Nimble/Matchers/BeGreaterThan.swift
+4 −4		Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift
+6 −6		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
+66 −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
+3 −2		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
+3 −2		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
+66 −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
+62 −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
+387 −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 −2		.gitignore
+3 −1		.hound.yml
+1 −1		.swift-version
+40 −40		.travis.yml
+2 −2		Dangerfile
+1 −0		Documentation/README.md
+2 −2		Documentation/en-us/ConfiguringQuick.md
+14 −14		Documentation/en-us/NimbleAssertions.md
+1 −1		Documentation/en-us/QuickExamplesAndGroups.md
+1 −1		Documentation/en-us/SharedExamples.md
+75 −0		Documentation/en-us/TestingApps.md
+14 −14		Documentation/ja/NimbleAssertions.md
+1 −1		Documentation/ja/QuickExamplesAndGroups.md
+203 −0		Documentation/ko-kr/ArrangeActAssert.md
+80 −0		Documentation/ko-kr/BehavioralTesting.md
+99 −0		Documentation/ko-kr/ConfiguringQuick.md
+25 −0		Documentation/ko-kr/InstallingFileTemplates.md
+141 −0		Documentation/ko-kr/InstallingQuick.md
+25 −0		Documentation/ko-kr/MoreResources.md
+97 −0		Documentation/ko-kr/NimbleAssertions.md
+462 −0		Documentation/ko-kr/QuickExamplesAndGroups.md
+49 −0		Documentation/ko-kr/QuickInObjectiveC.md
+35 −0		Documentation/ko-kr/README.md
+80 −0		Documentation/ko-kr/SettingUpYourXcodeProject.md
+116 −0		Documentation/ko-kr/SharedExamples.md
+129 −0		Documentation/ko-kr/TestUsingTestDoubles.md
+173 −0		Documentation/ko-kr/TestingApps.md
+10 −0		Documentation/ko-kr/Troubleshooting.md
+12 −12		Documentation/zh-cn/NimbleAssertions.md
+1 −1		Documentation/zh-cn/QuickExamplesAndGroups.md
+1 −1		Externals/Nimble
+1 −1		Gemfile
+43 −39		Gemfile.lock
+16 −0		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
+10 −3		Quick.podspec
+65 −42		Quick.xcodeproj/project.pbxproj
+1 −3		Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+1 −3		Quick.xcodeproj/xcshareddata/xcschemes/Quick-macOS.xcscheme
+1 −3		Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+8 −0		Quick.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+8 −0		Quick.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+3 −1		README.md
+13 −5		Rakefile
+1 −1		Sources/Quick/Behavior.swift
+3 −9		Sources/Quick/Callsite.swift
+2 −2		Sources/Quick/Configuration/Configuration.swift
+4 −4		Sources/Quick/Configuration/QuickConfiguration.swift
+12 −7		Sources/Quick/DSL/World+DSL.swift
+1 −1		Sources/Quick/ErrorUtility.swift
+6 −9		Sources/Quick/Example.swift
+3 −9		Sources/Quick/ExampleMetadata.swift
+3 −9		Sources/Quick/Filter.swift
+1 −1		Sources/Quick/NSBundle+CurrentTestBundle.swift
+20 −4		Sources/Quick/NSString+C99ExtendedIdentifier.swift
+2 −2		Sources/Quick/QuickMain.swift
+1 −1		Sources/Quick/QuickSelectedTestSuiteBuilder.swift
+9 −5		Sources/Quick/QuickSpec.swift
+1 −1		Sources/Quick/QuickTestSuite.swift
+6 −12		Sources/Quick/World.swift
+6 −1		Sources/QuickObjectiveC/Configuration/QuickConfiguration.m
+6 −2		Sources/QuickObjectiveC/DSL/QCKDSL.m
+0 −20		Sources/QuickObjectiveC/DSL/World+DSL.h
+6 −0		Sources/QuickObjectiveC/QuickSpec.h
+11 −3		Sources/QuickObjectiveC/QuickSpec.m
+0 −18		Sources/QuickObjectiveC/World.h
+5 −0		Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m
+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
+25 −0		Tests/QuickTests/QuickTests/FunctionalTests/CurrentSpecTests.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
+0 −1		Tests/QuickTests/QuickTests/Helpers/QCKSpecRunner.m
+7 −1		Tests/QuickTests/QuickTests/Helpers/QuickSpec+QuickSpec_MethodList.h
+5 −13		Tests/QuickTests/QuickTests/Helpers/QuickSpec+QuickSpec_MethodList.m
+1 −1		script/release
+0 −4		script/travis-install-macos