Merge pull request #33 from ikesyo/update-rac

Update to RAC 3.0 final
RACCommunity · Sep 15, 2015 · 640edfe · 640edfe
2 parents ae02278 + 4c068e0
commit 640edfe
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" "v3.0-RC.1"
+github "ReactiveCocoa/ReactiveCocoa" ~> 3.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "robrix/Box" "1.2.2"
 github "antitypical/Result" "0.4.4"
-github "ReactiveCocoa/ReactiveCocoa" "6c37b5ef416799a3a2a61ff78f051d5deb0d76b2"
+github "ReactiveCocoa/ReactiveCocoa" "v3.0.0"
diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa
diff --git a/Rex.xcodeproj/project.pbxproj b/Rex.xcodeproj/project.pbxproj
@@ -678,7 +678,6 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
-					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Source/Info.plist;
@@ -704,7 +703,6 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
-					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Source/Info.plist;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "ReactiveCocoa/ReactiveCocoa" "v3.0-RC.1"
		github "ReactiveCocoa/ReactiveCocoa" ~> 3.0
+2 −2		Documentation/DesignGuidelines.md
+2 −2		Documentation/FrameworkOverview.md
+9 −8		README.md
+39 −103		ReactiveCocoa/Objective-C/RACCommand.m
+4 −4		ReactiveCocoa/Objective-C/RACSignal.m
+2 −2		ReactiveCocoa/Swift/Action.swift
+2 −2		ReactiveCocoa/Swift/Bag.swift
+18 −17		ReactiveCocoa/Swift/Disposable.swift
+19 −4		ReactiveCocoa/Swift/Property.swift
+3 −3		ReactiveCocoa/Swift/Scheduler.swift
+0 −8		ReactiveCocoa/Swift/TupleExtensions.swift
+16 −0		ReactiveCocoaTests/Objective-C/RACCommandSpec.m
+49 −13		ReactiveCocoaTests/Swift/PropertySpec.swift