Merge pull request #316 from adjust/v4121

Version 4.12.1
adjust · Dec 13, 2017 · 1fab8d1 · 1fab8d1
2 parents e1d67b1 + abca14a
commit 1fab8d1
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 27 deletions.
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.12.0"
+  s.version        = "4.12.1"
   s.summary        = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
   s.homepage       = "https://github.com/adjust/ios_sdk"
   s.license        = { :type => 'MIT', :file => 'MIT-LICENSE' }
   s.author         = { "Christian Wellenbrock" => "welle@adjust.com" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.12.0" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.12.1" }
   s.ios.deployment_target = '6.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

diff --git a/Adjust/ADJReachability.h b/Adjust/ADJReachability.h
@@ -12,16 +12,16 @@
 
 
 typedef enum : NSInteger {
-	NotReachable = 0,
-	ReachableViaWiFi,
-	ReachableViaWWAN
-} NetworkStatus;
+	ADJNotReachable = 0,
+	ADJReachableViaWiFi,
+	ADJReachableViaWWAN
+} ADJNetworkStatus;
 
 #pragma mark IPv6 Support
 //Reachability fully support IPv6.  For full details, see ReadMe.md.
 
 
-extern NSString *kReachabilityChangedNotification;
+extern NSString *kADJReachabilityChangedNotification;
 
 
 @interface ADJReachability : NSObject
@@ -52,7 +52,7 @@ extern NSString *kReachabilityChangedNotification;
 - (BOOL)startNotifier;
 - (void)stopNotifier;
 
-- (NetworkStatus)currentReachabilityStatus;
+- (ADJNetworkStatus)currentReachabilityStatus;
 
 /*!
  * WWAN may be available, but not active until a connection has been established. WiFi may require a connection for VPN on Demand.

diff --git a/Adjust/ADJReachability.m b/Adjust/ADJReachability.m
@@ -17,7 +17,7 @@
 
 #pragma mark IPv6 Support
 
-NSString *kReachabilityChangedNotification = @"kNetworkReachabilityChangedNotification";
+NSString *kADJReachabilityChangedNotification = @"kNetworkReachabilityChangedNotification";
 
 #pragma mark - Supporting functions
 
@@ -52,7 +52,7 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
 
     ADJReachability* noteObject = (__bridge ADJReachability *)info;
     // Post a notification to notify the client that the network reachability changed.
-    [[NSNotificationCenter defaultCenter] postNotificationName: kReachabilityChangedNotification object: noteObject];
+    [[NSNotificationCenter defaultCenter] postNotificationName: kADJReachabilityChangedNotification object: noteObject];
 }
 
 
@@ -154,23 +154,23 @@ - (void)dealloc
 
 #pragma mark - Network Flag Handling
 
-- (NetworkStatus)networkStatusForFlags:(SCNetworkReachabilityFlags)flags
+- (ADJNetworkStatus)networkStatusForFlags:(SCNetworkReachabilityFlags)flags
 {
 	PrintReachabilityFlags(flags, "networkStatusForFlags");
 	if ((flags & kSCNetworkReachabilityFlagsReachable) == 0)
 	{
 		// The target host is not reachable.
-		return NotReachable;
+		return ADJNotReachable;
 	}
 
-    NetworkStatus returnValue = NotReachable;
+    ADJNetworkStatus returnValue = ADJNotReachable;
 
 	if ((flags & kSCNetworkReachabilityFlagsConnectionRequired) == 0)
 	{
 		/*
          If the target host is reachable and no connection is required then we'll assume (for now) that you're on Wi-Fi...
          */
-		returnValue = ReachableViaWiFi;
+		returnValue = ADJReachableViaWiFi;
 	}
 
 	if ((((flags & kSCNetworkReachabilityFlagsConnectionOnDemand ) != 0) ||
@@ -185,7 +185,7 @@ - (NetworkStatus)networkStatusForFlags:(SCNetworkReachabilityFlags)flags
             /*
              ... and no [user] intervention is needed...
              */
-            returnValue = ReachableViaWiFi;
+            returnValue = ADJReachableViaWiFi;
         }
     }
 
@@ -194,7 +194,7 @@ - (NetworkStatus)networkStatusForFlags:(SCNetworkReachabilityFlags)flags
 		/*
          ... but WWAN connections are OK if the calling application is using the CFNetwork APIs.
          */
-		returnValue = ReachableViaWWAN;
+		returnValue = ADJReachableViaWWAN;
 	}
 
 	return returnValue;
@@ -215,10 +215,10 @@ - (BOOL)connectionRequired
 }
 
 
-- (NetworkStatus)currentReachabilityStatus
+- (ADJNetworkStatus)currentReachabilityStatus
 {
 	NSAssert(_reachabilityRef != NULL, @"currentNetworkStatus called with NULL SCNetworkReachabilityRef");
-	NetworkStatus returnValue = NotReachable;
+	ADJNetworkStatus returnValue = ADJNotReachable;
 	SCNetworkReachabilityFlags flags;
 
 	if (SCNetworkReachabilityGetFlags(_reachabilityRef, &flags))

diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m
@@ -41,7 +41,7 @@
 
 static NSString *userAgent = nil;
 
-static NSString * const kClientSdk                  = @"ios4.12.0";
+static NSString * const kClientSdk                  = @"ios4.12.1";
 static NSString * const kDeeplinkParam              = @"deep_link=";
 static NSString * const kSchemeDelimiter            = @"://";
 static NSString * const kDefaultScheme              = @"AdjustUniversalScheme";

diff --git a/Adjust/Adjust.h b/Adjust/Adjust.h
@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust
 //
-//  V4.12.0
+//  V4.12.1
 //  Created by Christian Wellenbrock (wellle) on 23rd July 2013.
 //  Copyright © 2012-2017 Adjust GmbH. All rights reserved.
 //

diff --git a/AdjustTests/ADJPackageFields.m b/AdjustTests/ADJPackageFields.m
@@ -16,7 +16,7 @@ - (id) init {
 
     // default values
     self.appToken = @"qwerty123456";
-    self.clientSdk = @"ios4.12.0";
+    self.clientSdk = @"ios4.12.1";
     self.suffix = @"";
     self.environment = @"sandbox";
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Version 4.12.1 (13th December 2017)
+#### Fixed
+- Fixed compatibility of Adjust SDK with apps that are already using `Reachability` class (https://github.com/adjust/ios_sdk/issues/315) (thanks to @fedetrim).
+
+---
+
 ### Version 4.12.0 (13th December 2017)
 #### Added
 - Added reading of MCC.

diff --git a/README.md b/README.md
@@ -66,13 +66,13 @@ We will describe the steps to integrate the adjust SDK into your iOS project. We
 If you're using [CocoaPods][cocoapods], you can add the following line to your `Podfile` and continue from [this step](#sdk-integrate):
 
 ```ruby
-pod 'Adjust', '~> 4.12.0'
+pod 'Adjust', '~> 4.12.1'
 ```
 
 or:
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.12.0'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.12.1'
 ```
 
 ---

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.12.0
+4.12.1
diff --git a/doc/english/migrate.md b/doc/english/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for iOS to v4.12.0 from v3.4.0
+## Migrate your adjust SDK for iOS to v4.12.1 from v3.4.0
 
 ### Initial setup
 

diff --git a/doc/japanese/migrate_ja.md b/doc/japanese/migrate_ja.md
@@ -1,4 +1,4 @@
-## iOS用adjust SDKのv3.4.0からv.4.12.0への移行
+## iOS用adjust SDKのv3.4.0からv.4.12.1への移行
 
 ### 初期設定
 

diff --git a/doc/migrate.md b/doc/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for iOS to v4.12.0 from v3.4.0
+## Migrate your adjust SDK for iOS to v4.12.1 from v3.4.0
 
 ### Initial setup