diff --git a/Cartfile b/Cartfile index 53758e0..f0f99fa 100644 --- 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 index b096828..29e03c2 100644 --- 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 index 6c37b5e..e16f47c 160000 --- a/Carthage/Checkouts/ReactiveCocoa +++ b/Carthage/Checkouts/ReactiveCocoa @@ -1 +1 @@ -Subproject commit 6c37b5ef416799a3a2a61ff78f051d5deb0d76b2 +Subproject commit e16f47cf9cb568136ebd81430b24af274c3c27c7 diff --git a/Rex.xcodeproj/project.pbxproj b/Rex.xcodeproj/project.pbxproj index 5a55920..0e3cc6b 100644 --- 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;