Merge pull request #121 from ReactiveCocoa/update-quick-and-nimble

Update Quick and Nimble
ReactiveCocoa · Oct 6, 2017 · 1ce5316 · 1ce5316
2 parents 11e068d + 802fa9a
commit 1ce5316
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,10 @@
 language: objective-c
-osx_image: xcode8.1
+osx_image: xcode9
 before_install: true
 install: true
-git:
-  submodules: false
 branches:
   only:
     - master
-before_script:
-  - git submodule update --init --recursive
 script:
   - script/build
 xcode_workspace: ReactiveObjC.xcworkspace

diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" "3d9d996"
-github "Quick/Quick" ~> 0.10
-github "Quick/Nimble" ~> 5.0
+github "Quick/Quick" ~> 1.2
+github "Quick/Nimble" ~> 7.0.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v5.0.0"
-github "Quick/Quick" "v0.10.0"
+github "Quick/Nimble" "v7.0.2"
+github "Quick/Quick" "v1.2.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/ReactiveObjCTests/NSObjectRACLiftingSpec.m b/ReactiveObjCTests/NSObjectRACLiftingSpec.m
@@ -366,7 +366,7 @@
 			}];
 
 			[subject sendNext:testBlock];
-			expect(result).notTo(beNil());
+			expect((id)result).notTo(beNil());
 
 			result();
 			expect(@(blockInvoked)).to(beTruthy());
+36 −0		.github/ISSUE_TEMPLATE
+14 −0		.github/PULL_REQUEST_TEMPLATE
+2 −1		.gitignore
+2 −0		.hound.yml
+1 −1		.swift-version
+8 −0		.swiftlint.yml
+21 −5		.travis.yml
+53 −0		Dangerfile
+1 −0		Documentation/README.md
+1 −18		Documentation/en-us/InstallingQuick.md
+9 −3		Documentation/en-us/SettingUpYourXcodeProject.md
+3 −3		Documentation/en-us/SharedExamples.md
+34 −34		Documentation/en-us/TestUsingTestDoubles.md
+1 −1		Documentation/ja/ConfiguringQuick.md
+78 −0		Documentation/pt-br/BehavioralTesting.md
+39 −0		Documentation/pt-br/README.md
+116 −0		Documentation/pt-br/SharedExamples.md
+1 −0		Documentation/zh-cn/README.md
+113 −0		Documentation/zh-cn/SharedExamples.md
+1 −1		Externals/Nimble
+2 −0		Gemfile
+72 −26		Gemfile.lock
+43 −14		Package.swift
+40 −0		[email protected]
+1 −1		Quick Templates/Quick Configuration Class.xctemplate/Swift/___FILEBASENAME___.swift
+1 −1		Quick.podspec
+542 −91		Quick.xcodeproj/project.pbxproj
+31 −5		Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+31 −5		Quick.xcodeproj/xcshareddata/xcschemes/Quick-macOS.xcscheme
+31 −5		Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+29 −10		README.md
+4 −3		Rakefile
+17 −0		Sources/Quick/Behavior.swift
+22 −7		Sources/Quick/Callsite.swift
+5 −5		Sources/Quick/Configuration/Configuration.swift
+32 −1		Sources/Quick/Configuration/QuickConfiguration.swift
+56 −12		Sources/Quick/DSL/DSL.swift
+50 −14		Sources/Quick/DSL/World+DSL.swift
+1 −1		Sources/Quick/ErrorUtility.swift
+31 −11		Sources/Quick/Example.swift
+11 −15		Sources/Quick/ExampleGroup.swift
+14 −1		Sources/Quick/ExampleMetadata.swift
+14 −1		Sources/Quick/Filter.swift
+3 −3		Sources/Quick/Hooks/Closures.swift
+3 −3		Sources/Quick/Hooks/ExampleHooks.swift
+10 −1		Sources/Quick/NSBundle+CurrentTestBundle.swift
+33 −0		Sources/Quick/NSString+C99ExtendedIdentifier.swift
+11 −6		Sources/Quick/QuickMain.swift
+2 −2		Sources/Quick/QuickSelectedTestSuiteBuilder.swift
+78 −4		Sources/Quick/QuickSpec.swift
+6 −6		Sources/Quick/QuickTestSuite.swift
+0 −12		Sources/Quick/String+FileName.swift
+12 −0		Sources/Quick/URL+FileName.swift
+26 −11		Sources/Quick/World.swift
+0 −17		Sources/QuickObjectiveC/NSString+QCKSelectorName.h
+0 −37		Sources/QuickObjectiveC/NSString+QCKSelectorName.m
+9 −38		Sources/QuickObjectiveC/QuickSpec.m
+55 −0		Sources/QuickSpecBase/QuickSpecBase.m
+11 −0		Sources/QuickSpecBase/include/QuickSpecBase.h
+5 −7		Tests/LinuxMain.swift
+32 −0		Tests/QuickTests/QuickAfterSuiteTests/AfterSuiteTests+ObjC.m
+26 −0		Tests/QuickTests/QuickAfterSuiteTests/AfterSuiteTests.swift
+24 −0		Tests/QuickTests/QuickAfterSuiteTests/Info.plist
+22 −8		Tests/QuickTests/QuickFocusedTests/FocusedTests.swift
+0 −1		Tests/QuickTests/QuickTestHelpers/TestRun.swift
+4 −4		Tests/QuickTests/QuickTestHelpers/XCTestCaseProvider.swift
+20 −0		Tests/QuickTests/QuickTests/Fixtures/FunctionalTests_BehaviorTests_Behaviors.swift
+1 −1		Tests/QuickTests/QuickTests/Fixtures/FunctionalTests_SharedExamplesTests_SharedExamples.swift
+26 −27		Tests/QuickTests/QuickTests/FunctionalTests/AfterEachTests.swift
+0 −45		Tests/QuickTests/QuickTests/FunctionalTests/AfterSuiteTests.swift
+23 −24		Tests/QuickTests/QuickTests/FunctionalTests/BeforeEachTests.swift
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/BeforeSuiteTests.swift
+59 −0		Tests/QuickTests/QuickTests/FunctionalTests/BehaviorTests.swift
+30 −0		Tests/QuickTests/QuickTests/FunctionalTests/BundleModuleNameTests.swift
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/Configuration/AfterEach/Configuration+AfterEachTests.swift
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/Configuration/BeforeEach/Configuration+BeforeEachTests.swift
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/ContextTests.swift
+2 −2		Tests/QuickTests/QuickTests/FunctionalTests/CrossReferencingSpecs.swift
+2 −2		Tests/QuickTests/QuickTests/FunctionalTests/DescribeTests.swift
+14 −16		Tests/QuickTests/QuickTests/FunctionalTests/ItTests.swift
+0 −42		Tests/QuickTests/QuickTests/FunctionalTests/ObjC/AfterSuiteTests+ObjC.m
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/ObjC/FailureUsingXCTAssertTests+ObjC.m
+9 −2		Tests/QuickTests/QuickTests/FunctionalTests/PendingTests.swift
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/SharedExamples+BeforeEachTests.swift
+3 −3		Tests/QuickTests/QuickTests/FunctionalTests/SharedExamplesTests.swift
+1 −1		Tests/QuickTests/QuickTests/Helpers/QuickTestsBridgingHeader.h