Merge pull request #29 from Fueled/rac-9

chore(project): update to rac9 and include needed sources for tvOS.
Fueled · Apr 5, 2019 · b3d8e78 · b3d8e78
2 parents c568706 + afd0924
commit b3d8e78
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 13 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" ~> 8.0
+github "ReactiveCocoa/ReactiveCocoa" ~> 9.0
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,2 +1,2 @@
-github "Quick/Quick" ~> 1.3.2
-github "Quick/Nimble" ~> 7.3.2
+github "Quick/Quick" ~> 2.0
+github "Quick/Nimble" ~> 8.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v7.3.4"
-github "Quick/Quick" "v1.3.4"
-github "ReactiveCocoa/ReactiveCocoa" "8.0.2"
-github "ReactiveCocoa/ReactiveSwift" "4.0.0"
+github "Quick/Nimble" "v8.0.1"
+github "Quick/Quick" "v2.0.0"
+github "ReactiveCocoa/ReactiveCocoa" "9.0.0"
+github "ReactiveCocoa/ReactiveSwift" "5.0.1"
 github "antitypical/Result" "4.1.0"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
diff --git a/FueledUtils.podspec b/FueledUtils.podspec
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
 	s.osx.exclude_files = ['FueledUtils/FueledUtils.h', 'FueledUtils/ButtonWithTitleAdjustment.swift', 'FueledUtils/DecoratingTextFieldDelegate.swift', 'FueledUtils/DimmingButton.swift', 'FueledUtils/HairlineView.swift', 'FueledUtils/HairlineView.swift', 'FueledUtils/KeyboardInsetHelper.swift', 'FueledUtils/LabelWithTitleAdjustment.swift', 'FueledUtils/ReactiveCocoaExtensions.swift', 'FueledUtils/ScrollViewPage.swift', 'FueledUtils/SetRootViewController.swift', 'FueledUtils/SignalingAlert.swift', 'FueledUtils/UIExtensions.swift', 'FueledUtils/GradientView.swift']
 	s.ios.exclude_files = ['FueledUtils/FueledUtils.h']
 	s.watchos.exclude_files = ['FueledUtils/FueledUtils.h', 'FueledUtils/ButtonWithTitleAdjustment.swift', 'FueledUtils/DecoratingTextFieldDelegate.swift', 'FueledUtils/DimmingButton.swift', 'FueledUtils/HairlineView.swift', 'FueledUtils/HairlineView.swift', 'FueledUtils/KeyboardInsetHelper.swift', 'FueledUtils/LabelWithTitleAdjustment.swift', 'FueledUtils/ReactiveCocoaExtensions.swift', 'FueledUtils/ScrollViewPage.swift', 'FueledUtils/SetRootViewController.swift', 'FueledUtils/SignalingAlert.swift', 'FueledUtils/UIExtensions.swift', 'FueledUtils/GradientView.swift']
-	s.tvos.exclude_files = ['FueledUtils/FueledUtils.h', 'FueledUtils/HairlineView.swift', 'FueledUtils/KeyboardInsetHelper.swift', 'FueledUtils/ReactiveCocoaExtensions.swift', 'FueledUtils/UIExtensions.swift']
+	s.tvos.exclude_files = ['FueledUtils/FueledUtils.h', 'FueledUtils/KeyboardInsetHelper.swift']
 
-	s.dependency 'ReactiveCocoa', '~> 8.0'
+	s.dependency 'ReactiveCocoa', '~> 9.0'
 end
diff --git a/FueledUtils.xcodeproj/project.pbxproj b/FueledUtils.xcodeproj/project.pbxproj
@@ -28,6 +28,8 @@
 		02DF8ECB1E6464AB009AB29C /* ReactiveLifetimeProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02DF8ECA1E6464AB009AB29C /* ReactiveLifetimeProvider.swift */; };
 		02E626091D340F0C0041E512 /* LoadingState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02E626081D340F0C0041E512 /* LoadingState.swift */; };
 		35996E0F1F55C3E1004D6AC0 /* FoundationExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35996E0E1F55C3E1004D6AC0 /* FoundationExtensions.swift */; };
+		991267652257405F00D39A08 /* ReactiveCocoaExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F40C574121F909290006FB3F /* ReactiveCocoaExtensions.swift */; };
+		99126766225740DB00D39A08 /* UIExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02DE3C3A1D258FD1002B58E2 /* UIExtensions.swift */; };
 		DFA57F0621E7A64200467647 /* GradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFA57F0521E7A64200467647 /* GradientView.swift */; };
 		F40C574221F9092A0006FB3F /* ReactiveCocoaExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F40C574121F909290006FB3F /* ReactiveCocoaExtensions.swift */; };
 		F40C574421F909A60006FB3F /* ActionProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F40C574321F909A60006FB3F /* ActionProtocol.swift */; };
@@ -465,6 +467,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 02DE3C141D258C79002B58E2;
@@ -579,6 +582,7 @@
 				F463DFCC222D83060031AAA5 /* LoadingState.swift in Sources */,
 				F463DFC1222D83060031AAA5 /* ActionProtocol.swift in Sources */,
 				F463DFC7222D83060031AAA5 /* TransferState.swift in Sources */,
+				99126766225740DB00D39A08 /* UIExtensions.swift in Sources */,
 				F463DFC4222D83060031AAA5 /* CollectionExtensions.swift in Sources */,
 				F463DFCB222D83060031AAA5 /* LabelWithTitleAdjustment.swift in Sources */,
 				F463DFD4222D83060031AAA5 /* SetRootViewController.swift in Sources */,
@@ -589,6 +593,7 @@
 				F463DFC6222D83060031AAA5 /* DimmingButton.swift in Sources */,
 				F463DFD0222D83060031AAA5 /* ReactiveSwiftExtensions.swift in Sources */,
 				F463DFCF222D83060031AAA5 /* ReactiveLifetimeProvider.swift in Sources */,
+				991267652257405F00D39A08 /* ReactiveCocoaExtensions.swift in Sources */,
 				F463DFD7222D83060031AAA5 /* TypedSerialDisposable.swift in Sources */,
 				F463DFC2222D83060031AAA5 /* ButtonWithTitleAdjustment.swift in Sources */,
 				F463DFC5222D83060031AAA5 /* DecoratingTextFieldDelegate.swift in Sources */,

diff --git a/FueledUtils/ReactiveCocoaExtensions.swift b/FueledUtils/ReactiveCocoaExtensions.swift
@@ -17,6 +17,7 @@ import Foundation
 import ReactiveCocoa
 import ReactiveSwift
 import Result
+import UIKit
 
 ///
 /// Use with `SignalProtocol.observe(context:)` or  `SignalProducerProtocol.observe(context:)` below to animate
@@ -157,6 +158,7 @@ extension Reactive where Base: UIStackView {
 	}
 }
 
+#if os(iOS)
 extension Reactive where Base: UINavigationItem {
 	///
 	/// Show/hide the back button, optionally with an animation.
@@ -213,3 +215,4 @@ extension Reactive where Base: UINavigationItem {
 		return makeBindingTarget { $0.leftBarButtonItems = $1 }
 	}
 }
+#endif
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "ReactiveCocoa/ReactiveCocoa" ~> 8.0
		github "ReactiveCocoa/ReactiveCocoa" ~> 9.0
+1 −1		.swift-version
+16 −4		.swiftlint.yml
+24 −44		.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		[email protected]
+6 −21		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
+2 −2		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
+25 −4		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
+7 −6		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
+3 −63		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
+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
+9 −0		Tests/NimbleTests/objc/ObjCContainTest.m
+0 −1		Tests/NimbleTests/objc/ObjCEndWithTest.m
+9 −0		Tests/NimbleTests/objc/ObjCHaveCountTest.m
+7 −3		test
+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		[email protected]
+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
+1 −1		.swift-version
+69 −59		.travis.yml
+13 −1		CHANGELOG.md
+1 −1		Cartfile
+2 −2		Cartfile.private
+3 −3		Cartfile.resolved
+1 −1		Carthage/Checkouts/Nimble
+1 −1		Carthage/Checkouts/Quick
+1 −1		Carthage/Checkouts/Result
+8 −8		Documentation/Example.OnlineSearch.md
+9 −9		Documentation/ReactivePrimitives.md
+1 −1		Documentation/RxComparison.md
+6 −6		Package.resolved
+3 −3		Package.swift
+19 −0		[email protected]
+4 −4		README.md
+1 −1		ReactiveSwift.playground/Pages/Signal.xcplaygroundpage/Contents.swift
+19 −0		ReactiveSwift.playground/Pages/SignalProducer.xcplaygroundpage/Contents.swift
+3 −3		ReactiveSwift.podspec
+8 −3		ReactiveSwift.xcodeproj/project.pbxproj
+4 −5		ReactiveSwift.xcodeproj/xcshareddata/xcschemes/ReactiveSwift-iOS.xcscheme
+4 −5		ReactiveSwift.xcodeproj/xcshareddata/xcschemes/ReactiveSwift-macOS.xcscheme
+4 −5		ReactiveSwift.xcodeproj/xcshareddata/xcschemes/ReactiveSwift-tvOS.xcscheme
+37 −0		Sources/Action.swift
+1 −1		Sources/Atomic.swift
+51 −10		Sources/Event.swift
+1 −1		Sources/Info.plist
+1 −1		Sources/ResultExtensions.swift
+10 −4		Sources/Scheduler.swift
+23 −0		Sources/Signal.swift
+25 −2		Sources/SignalProducer.swift
+45 −0		Tests/ReactiveSwiftTests/ActionSpec.swift
+1 −1		Tests/ReactiveSwiftTests/Info.plist
+1 −1		Tests/ReactiveSwiftTests/SchedulerSpec.swift
+71 −0		Tests/ReactiveSwiftTests/SignalProducerLiftingSpec.swift
+71 −0		Tests/ReactiveSwiftTests/SignalSpec.swift
+2 −1		script/build