Merge pull request #302 from orta/use-rac-objc

Use ReactiveObjc instead of ReactiveCocoa

ARAnalytics.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         =  'ARAnalytics'
-  s.version      =  '4.0.2'
+  s.version      =  '5.0.0'
   s.license      =  {:type => 'MIT', :file => 'LICENSE' }
   s.homepage     =  'https://github.com/orta/ARAnalytics'
   s.authors      =  { 'orta' => '[email protected]', 'Daniel Haight' => "[email protected]" }
@@ -73,13 +73,13 @@ Pod::Spec.new do |s|
     ss.exclude_files = ['ARDSL.{h,m}']
     ss.private_header_files = 'ARNavigationControllerDelegateProxy.h'
     ss.tvos.deployment_target = '9.0'
-	  ss.ios.deployment_target = '7.0'
+	  ss.ios.deployment_target = '8.0'
   end
 
   s.subspec "DSL" do |ss|
     ss.source_files = ['ARDSL.{h,m}']
     ss.dependency 'RSSwizzle', '~> 0.1.0'
-    ss.dependency 'ReactiveCocoa', '~> 2.0'
+    ss.dependency 'ReactiveObjC', '~> 2.0'
   end
 
   # for the description

ARDSL.m

@@ -1,6 +1,6 @@
 #import "ARDSL.h"
 #import <RSSwizzle/RSSwizzle.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
+#import <ReactiveObjC/ReactiveObjC.h>
 
 NSString * const ARAnalyticsTrackedEvents = @"trackedEvents";
 NSString * const ARAnalyticsTrackedScreens = @"trackedScreens";

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Master
 
+* Use ReactiveObjC instead of ReactiveCocoa in DSL - orta/DinosaurDad
+* Drop iOS 7 support - orta/DinosaurDad
+
 ## Version 4.0.2
 
 * Allows AdjustProvider to be set up with an AdjustDelegate

Example/Podfile.lock

@@ -1,21 +1,15 @@
 PODS:
-  - ARAnalytics/CoreIOS (4.0.1)
-  - ARAnalytics/DSL (4.0.1):
-    - ReactiveCocoa (~> 2.0)
+  - ARAnalytics/CoreIOS (5.0.0)
+  - ARAnalytics/DSL (5.0.0):
+    - ReactiveObjC (~> 2.0)
     - RSSwizzle (~> 0.1.0)
-  - ARAnalytics/Intercom (4.0.1):
+  - ARAnalytics/Intercom (5.0.0):
     - ARAnalytics/CoreIOS
     - Intercom
   - Expecta (0.4.2)
   - Intercom (2.3.22)
   - OCMock (3.2.1)
-  - ReactiveCocoa (2.5):
-    - ReactiveCocoa/UI (= 2.5)
-  - ReactiveCocoa/Core (2.5):
-    - ReactiveCocoa/no-arc
-  - ReactiveCocoa/no-arc (2.5)
-  - ReactiveCocoa/UI (2.5):
-    - ReactiveCocoa/Core
+  - ReactiveObjC (2.1.2)
   - RSSwizzle (0.1.0)
   - Specta (1.0.6)
 
@@ -31,11 +25,11 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  ARAnalytics: 85e7bb999e2a40cea7d2394e71e8ecbafa50f2d0
+  ARAnalytics: cd4de4bdbb5a57e8b56552b42971d01d3729af3c
   Expecta: 78b4e8b0c8291fa4524d7f74016b6065c2e391ec
   Intercom: b5a089123a1438352b1223d731e3c3cdee685c9e
   OCMock: f9622770761b680e505f893885780d369ae30016
-  ReactiveCocoa: e2db045570aa97c695e7aa97c2bcab222ae51f4a
+  ReactiveObjC: 7b6782ae39f9ac0f57205c3b0c0b69b9dd7048c0
   RSSwizzle: d561958f595028bfcef98c7d55c318b3878a61c6
   Specta: f506f3a8361de16bc0dcf3b17b75e269072ba465