Merge pull request #209 from adjust/v473

CPU family params read if they exist
adjust · Jul 12, 2016 · d4b3fc2 · d4b3fc2
2 parents fdcec8e + 0b1eda4
commit d4b3fc2
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 9 deletions.
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.7.2"
+  s.version        = "4.7.3"
   s.summary        = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
   s.homepage       = "http://adjust.com"
   s.license        = { :type => 'MIT', :file => 'MIT-LICENSE' }
   s.author         = { "Christian Wellenbrock" => "[email protected]" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.7.2" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.7.3" }
   s.ios.deployment_target = '6.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

diff --git a/Adjust/ADJSystemProfile.m b/Adjust/ADJSystemProfile.m
@@ -67,10 +67,14 @@ + (NSString*) cpuFamily
             return @"CPUFAMILY_POWERPC_G5";
         case CPUFAMILY_INTEL_6_13:
             return @"CPUFAMILY_INTEL_6_13";
+#ifdef CPUFAMILY_INTEL_YONAH
         case CPUFAMILY_INTEL_YONAH:
             return @"CPUFAMILY_INTEL_YONAH";
+#endif
+#ifdef CPUFAMILY_INTEL_MEROM
         case CPUFAMILY_INTEL_MEROM:
             return @"CPUFAMILY_INTEL_MEROM";
+#endif
         case CPUFAMILY_INTEL_PENRYN:
             return @"CPUFAMILY_INTEL_PENRYN";
         case CPUFAMILY_INTEL_NEHALEM:

diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m
@@ -20,7 +20,7 @@
 
 static NSDateFormatter *dateFormat;
 
-static NSString * const kClientSdk      = @"ios4.7.2";
+static NSString * const kClientSdk      = @"ios4.7.3";
 static NSString * const kDefaultScheme  = @"AdjustUniversalScheme";
 static NSString * const kUniversalLinkPattern  = @"https://[^.]*\\.ulink\\.adjust\\.com/ulink/?(.*)";
 

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### Version 4.7.3 (12th July 2016)
+#### Changed
+- Adding #define for `CPUFAMILY_INTEL_YONAH` due to its deprecation in iOS 10.
+- Adding #define for `CPUFAMILY_INTEL_MEROM` due to its deprecation in iOS 10.
+
+---
+
 ### Version 4.7.2 (9th July 2016)
 #### Changed
 - Re-enabled SDK auto-start upon initialisation.

diff --git a/README.md b/README.md
@@ -62,13 +62,13 @@ If you're using [CocoaPods][cocoapods], you can add the following line to your
 `Podfile` and continue with [step 4](#step4):
 
 ```ruby
-pod 'Adjust', '~> 4.7.2'
+pod 'Adjust', '~> 4.7.3'
 ```
 
 or:
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.7.2'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.7.3'
 ```
 
 If you're using [Carthage][carthage], you can add following line to your `Cartfile`
@@ -854,7 +854,7 @@ package looking something like this:
 ```
 [Adjust]d: Added package 1 (click)
 [Adjust]v: Path:      /sdk_click
-[Adjust]v: ClientSdk: ios4.7.2
+[Adjust]v: ClientSdk: ios4.7.3
 [Adjust]v: Parameters:
 [Adjust]v:      app_token              {YourAppToken}
 [Adjust]v:      created_at             2016-04-15T14:25:51.676Z+0200

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