Merge pull request #69 from Carthage/swift2.3

Support Swift 2.3
Carthage · Jul 19, 2016 · d6c4bf4 · d6c4bf4
2 parents 2667679 + 3ead4cc
commit d6c4bf4
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,19 @@
 language: objective-c
-osx_image: xcode7.3
 xcode_workspace: ReactiveTask.xcworkspace
-xcode_scheme: ReactiveTask
 git:
   submodules: false
 before_script:
   - git submodule update --init --recursive
 script:
   - set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
+matrix:
+  include:
+    - osx_image: xcode7.3
+      xcode_scheme: ReactiveTask
+      env: JOB=Xcode7.3
+    - osx_image: xcode8
+      xcode_scheme: ReactiveTask
+      env: JOB=Xcode8
 notifications:
   email: false
   slack:
@@ -27,3 +33,4 @@ deploy:
   on:
     repo: Carthage/ReactiveTask
     tags: true
+    condition: $JOB = Xcode7.3
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" ~> 4.2.1
+github "ReactiveCocoa/ReactiveCocoa" ~> 4.2.2
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "sharplet/Quick" "xcode-8"
 github "Quick/Nimble" "188caeb"
-github "jspahrsummers/xcconfigs" ~> 0.9
+github "jspahrsummers/xcconfigs" "1ef9763"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
 github "Quick/Nimble" "188caeb094bc342614d8a5c706cd8bb9a6c355eb"
 github "sharplet/Quick" "e2cfb86c8379417c9272bb853e9f0c407167d486"
-github "antitypical/Result" "2.1.2"
-github "jspahrsummers/xcconfigs" "0.9"
-github "ReactiveCocoa/ReactiveCocoa" "v4.2.1"
+github "antitypical/Result" "2.1.3"
+github "jspahrsummers/xcconfigs" "1ef97639ffbe041da0b1392b2114fa19b922a7a1"
+github "ReactiveCocoa/ReactiveCocoa" "v4.2.2"
diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
diff --git a/ReactiveTask.xcodeproj/project.pbxproj b/ReactiveTask.xcodeproj/project.pbxproj
@@ -274,9 +274,11 @@
 				TargetAttributes = {
 					D0BFEA571A2D1E5E00E23194 = {
 						CreatedOnToolsVersion = 6.1.1;
+						LastSwiftMigration = 0800;
 					};
 					D0BFEA621A2D1E5E00E23194 = {
 						CreatedOnToolsVersion = 6.1.1;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -354,6 +356,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
+				SWIFT_VERSION = 2.3;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -367,6 +370,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				SDKROOT = macosx;
+				SWIFT_VERSION = 2.3;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -434,6 +438,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				SDKROOT = macosx;
+				SWIFT_VERSION = 2.3;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -474,6 +479,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				SDKROOT = macosx;
+				SWIFT_VERSION = 2.3;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "ReactiveCocoa/ReactiveCocoa" ~> 4.2.1
		github "ReactiveCocoa/ReactiveCocoa" ~> 4.2.2
+1 −1		.gitmodules
+42 −0		.travis.yml
+1 −1		Cartfile
+3 −3		Cartfile.private
+4 −4		Cartfile.resolved
+1 −1		Carthage/Checkouts/Nimble
+1 −1		Carthage/Checkouts/Quick
+1 −1		Carthage/Checkouts/Result
+1 −1		Carthage/Checkouts/xcconfigs
+131 −0		Documentation/DocumentingCode.md
+25 −0		ReactiveCocoa.playground/Pages/Sandbox.xcplaygroundpage/Contents.swift
+3 −3		ReactiveCocoa.playground/Pages/SignalProducer.xcplaygroundpage/Contents.swift
+1 −0		ReactiveCocoa.playground/contents.xcplayground
+37 −28		ReactiveCocoa.xcodeproj/project.pbxproj
+32 −11		ReactiveCocoa/Swift/Action.swift
+20 −8		ReactiveCocoa/Swift/Atomic.swift
+13 −7		ReactiveCocoa/Swift/Bag.swift
+27 −7		ReactiveCocoa/Swift/CocoaAction.swift
+61 −15		ReactiveCocoa/Swift/Disposable.swift
+10 −4		ReactiveCocoa/Swift/DynamicProperty.swift
+27 −7		ReactiveCocoa/Swift/Event.swift
+27 −4		ReactiveCocoa/Swift/EventLogger.swift
+125 −111		ReactiveCocoa/Swift/Flatten.swift
+27 −7		ReactiveCocoa/Swift/FoundationExtensions.swift
+111 −35		ReactiveCocoa/Swift/ObjectiveCBridging.swift
+30 −8		ReactiveCocoa/Swift/Observer.swift
+128 −20		ReactiveCocoa/Swift/Property.swift
+142 −29		ReactiveCocoa/Swift/Scheduler.swift
+515 −216		ReactiveCocoa/Swift/Signal.swift
+818 −327		ReactiveCocoa/Swift/SignalProducer.swift
+5 −3		ReactiveCocoaTests/Swift/ActionSpec.swift
+24 −0		ReactiveCocoaTests/Swift/FlattenSpec.swift
+7 −5		ReactiveCocoaTests/Swift/PropertySpec.swift
+22 −12		ReactiveCocoaTests/Swift/SignalProducerLiftingSpec.swift
+61 −2		ReactiveCocoaTests/Swift/SignalProducerSpec.swift
+52 −9		ReactiveCocoaTests/Swift/SignalSpec.swift
+27 −0		ReactiveCocoaTests/Swift/TestError.swift
+6 −0		script/build
+1 −1		Result.podspec
+10 −0		Result.xcodeproj/project.pbxproj
+1 −1		Result/Info.plist
+1 −1		Tests/Result/Info.plist