Switch to ReactiveObjC

anivaros · anivaros · commit faa3ce9b6370 · 2016-12-05T17:59:07.000+03:00
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.3
+github "ReactiveCocoa/ReactiveObjC" ~> 2.1.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,4 @@
 github "Quick/Nimble" "v0.2.0"
 github "Quick/Quick" "v0.2.2"
-github "ReactiveCocoa/ReactiveCocoa" "v2.4.3"
+github "ReactiveCocoa/ReactiveObjC" "v2.1.0"
 github "jspahrsummers/xcconfigs" "0.7.1"
diff --git a/ReactiveViewModel/RVMViewModel.m b/ReactiveViewModel/RVMViewModel.m
@@ -8,8 +8,7 @@
 
 #import "RVMViewModel.h"
 #import <libkern/OSAtomic.h>
-#import <ReactiveCocoa/EXTScope.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
+#import <ReactiveObjC/ReactiveObjC.h>
 
 // The number of seconds by which signal events are throttled when using
 // -throttleSignalWhileInactive:.
diff --git a/ReactiveViewModel/ReactiveViewModel.h b/ReactiveViewModel/ReactiveViewModel.h
@@ -16,4 +16,4 @@ FOUNDATION_EXPORT const unsigned char ReactiveViewModelVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <ReactiveViewModel/PublicHeader.h>
 
-#import <ReactiveViewModel/RVMViewModel.h>
+#import <ReactiveViewModel/RVMViewModel.h>
diff --git a/ReactiveViewModelTests/RVMViewModelSpec.m b/ReactiveViewModelTests/RVMViewModelSpec.m
@@ -8,7 +8,7 @@
 
 #import <Nimble/Nimble.h>
 #import <Quick/Quick.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
+#import <ReactiveObjC/ReactiveObjC.h>
 #import <ReactiveViewModel/ReactiveViewModel.h>
 
 #import "RVMTestViewModel.h"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.3`
	`1`	`+github "ReactiveCocoa/ReactiveObjC" ~> 2.1.0`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,4 @@ FOUNDATION_EXPORT const unsigned char ReactiveViewModelVersionString[];`
`16`	`16`
`17`	`17`	`// In this header, you should import all the public headers of your framework using statements like #import <ReactiveViewModel/PublicHeader.h>`
`18`	`18`
`19`		`-#import <ReactiveViewModel/RVMViewModel.h>`
	`19`	`+#import <ReactiveViewModel/RVMViewModel.h>`