Merge pull request #468 from adjust/v4231

uerceg · web-flow · commit 3a30f97f685c · 2020-09-16T14:15:22.000+02:00
Version 4.23.1
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.23.0"
+  s.version        = "4.23.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.23.0" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.23.1" }
   s.ios.deployment_target = '6.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'
diff --git a/Adjust.xcodeproj/project.pbxproj b/Adjust.xcodeproj/project.pbxproj
@@ -23,8 +23,6 @@
 
 /* Begin PBXBuildFile section */
 		2067002A1F18BDC700B4FDE1 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9601C19C1A31DD7F00A9AE21 /* CoreTelephony.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-		6FBEE8F324E2C26F00FEF3F1 /* ADJUrlStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FBEE8F124E2C26F00FEF3F1 /* ADJUrlStrategy.h */; };
-		6FBEE8F524E2C26F00FEF3F1 /* ADJUrlStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBEE8F224E2C26F00FEF3F1 /* ADJUrlStrategy.m */; };
 		6FBEE92624E422EB00FEF3F1 /* ADJUrlStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBEE92424E422EB00FEF3F1 /* ADJUrlStrategy.m */; };
 		6FBEE92724E422EB00FEF3F1 /* ADJUrlStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBEE92424E422EB00FEF3F1 /* ADJUrlStrategy.m */; };
 		6FBEE92824E422EB00FEF3F1 /* ADJUrlStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FBEE92524E422EB00FEF3F1 /* ADJUrlStrategy.h */; };
@@ -1910,7 +1908,6 @@
 				96BCFBD11AC99246005A65C5 /* ADJAttribution.h in Headers */,
 				9D2F23E22447CE5C00B7CA90 /* ADJSubscription.h in Headers */,
 				9601CAE81C74BAAE00670879 /* ADJEventFailure.h in Headers */,
-				6FBEE8F324E2C26F00FEF3F1 /* ADJUrlStrategy.h in Headers */,
 				9601CAE41C74B70600670879 /* ADJEventSuccess.h in Headers */,
 				6FCC85011F278CF300D6A0ED /* ADJReachability.h in Headers */,
 				96BCFBD41AC99338005A65C5 /* NSData+ADJAdditions.h in Headers */,
@@ -2610,7 +2607,6 @@
 				969952D21A01309200928462 /* ADJAttribution.m in Sources */,
 				960A8BB91A029A8000F2BB95 /* ADJConfig.m in Sources */,
 				96854A5A1B1F2779002B2874 /* ADJTimerOnce.m in Sources */,
-				6FBEE8F524E2C26F00FEF3F1 /* ADJUrlStrategy.m in Sources */,
 				96854A601B1F278C002B2874 /* ADJTimerCycle.m in Sources */,
 				96FCC53B1C186426007BBFE1 /* ADJResponseData.m in Sources */,
 				968173841C3C2D07002AE1DE /* ADJSessionSuccess.m in Sources */,
diff --git a/Adjust/ADJSystemProfile.m b/Adjust/ADJSystemProfile.m
@@ -832,7 +832,8 @@ + (NSUInteger)batteryLevel {
     if (![[UIDevice currentDevice] isBatteryMonitoringEnabled]) {
        [[UIDevice currentDevice] setBatteryMonitoringEnabled:YES];
     }
-    NSUInteger batteryLevel = (NSUInteger)(UIDevice.currentDevice.batteryLevel * 100);
+    float fBatteryLevel = UIDevice.currentDevice.batteryLevel;
+    NSUInteger batteryLevel = fBatteryLevel >= 0 ? (NSUInteger)(fBatteryLevel * 100) : 0;
     return batteryLevel;
 #endif
 }
diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m
@@ -37,7 +37,7 @@
 static CTTelephonyNetworkInfo *networkInfo = nil;
 #endif
 
-static NSString * const kClientSdk                  = @"ios4.23.0";
+static NSString * const kClientSdk                  = @"ios4.23.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.23.0
+//  V4.23.1
 //  Created by Christian Wellenbrock (wellle) on 23rd July 2013.
 //  Copyright © 2012-2017 Adjust GmbH. All rights reserved.
 //
diff --git a/AdjustBridge/AdjustBridgeRegister.m b/AdjustBridge/AdjustBridgeRegister.m
@@ -221,7 +221,7 @@ + (NSString *)adjust_js {
                 if (this.sdkPrefix) {
                     return this.sdkPrefix;
                 } else {
-                    return 'web-bridge4.23.0';
+                    return 'web-bridge4.23.1';
                 }
             },
             setTestOptions: function(testOptions) {
diff --git a/AdjustTests/AdjustUnitTests/ADJPackageFields.m b/AdjustTests/AdjustUnitTests/ADJPackageFields.m
@@ -16,7 +16,7 @@ - (id) init {
 
     // default values
     self.appToken = @"qwerty123456";
-    self.clientSdk = @"ios4.23.0";
+    self.clientSdk = @"ios4.23.1";
     self.suffix = @"";
     self.environment = @"sandbox";
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### Version 4.23.1 (16th September 2020)
+#### Fixed
+- Fixed warning about storing negative value to `NSUInteger` data type.
+- Fixed duplicated `ADJURLStrategy` symbols error when using static framework.
+
+---
+
 ### Version 4.23.0 (19th August 2020)
 #### Added
 - Added communication with SKAdNetwork framework by default on iOS 14.
diff --git a/README.md b/README.md
@@ -78,13 +78,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.23.0'
+pod 'Adjust', '~> 4.23.1'
 ```
 
 or:
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.0'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.1'
 ```
 
 ---
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.23.0
+4.23.1
diff --git a/doc/chinese/README.md b/doc/chinese/README.md
@@ -76,13 +76,13 @@ Read this in other languages: [English][en-readme], [中文][zh-readme], [日本
 如果您正在使用[CocoaPods][cocoapods],您可以将以下代码行添加至 `Podfile`，然后继续进行[此步骤](#sdk-integrate):
 
 ```ruby
-pod 'Adjust', '~> 4.23.0'
+pod 'Adjust', '~> 4.23.1'
 ```
 
 或:
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.0'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.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.23.0 from v3.4.0
+## Migrate your Adjust SDK for iOS to v4.23.1 from v3.4.0
 
 ### Initial setup
 
diff --git a/doc/english/web_views.md b/doc/english/web_views.md
@@ -64,7 +64,7 @@ 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/WebBridge', '~> 4.23.0'
+pod 'Adjust/WebBridge', '~> 4.23.1'
 ```
 
 ---
diff --git a/doc/japanese/README.md b/doc/japanese/README.md
@@ -25,13 +25,13 @@ adjust SDKをiOSプロジェクトに連携する手順を説明します。
 [こちらの手順](#sdk-integrate)に進んでください。
 
 ```ruby
-pod 'Adjust', '~> 4.23.0'
+pod 'Adjust', '~> 4.23.1'
 ```
 
 または
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.0'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.1'
 ```
 
 ---
diff --git a/doc/korean/README.md b/doc/korean/README.md
@@ -76,13 +76,13 @@ iOS 개발용 Xcode를 사용한다는 가정하에 iOS 프로젝트에 Adjust S
 [CocoaPods][cocoapods]를 사용하는 경우, 다음 내용을 `Podfile`에 추가한 후 [해당 단계](#sdk-integrate)를 완료하세요.
 
 ```ruby
-pod 'Adjust', '~> 4.23.0'
+pod 'Adjust', '~> 4.23.1'
 ```
 
 또는:
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.0'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.1'
 ```
 
 ---
diff --git a/doc/korean/web_views.md b/doc/korean/web_views.md
@@ -64,7 +64,7 @@ iOS 개발용 Xcode를 사용한다는 가정하에 iOS 프로젝트에 Adjust S
 [CocoaPods][cocoapods]를 사용하는 경우, 다음 내용을 'Podfile'에 추가한 후 [해당 단계](#sdk-integrate)를 완료하세요.
 
 ```ruby
-pod 'Adjust/WebBridge', '~> 4.23.0'
+pod 'Adjust/WebBridge', '~> 4.23.1'
 ```
 
 ---
diff --git a/doc/migrate.md b/doc/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for iOS to v4.23.0 from v3.4.0
+## Migrate your Adjust SDK for iOS to v4.23.1 from v3.4.0
 
 ### Initial setup
 

Original file line number	Diff line number	Diff line change
`@@ -832,7 +832,8 @@ + (NSUInteger)batteryLevel {`
`832`	`832`	`if (![[UIDevice currentDevice] isBatteryMonitoringEnabled]) {`
`833`	`833`	`[[UIDevice currentDevice] setBatteryMonitoringEnabled:YES];`
`834`	`834`	`}`
`835`		`- NSUInteger batteryLevel = (NSUInteger)(UIDevice.currentDevice.batteryLevel * 100);`
	`835`	`+ float fBatteryLevel = UIDevice.currentDevice.batteryLevel;`
	`836`	`+ NSUInteger batteryLevel = fBatteryLevel >= 0 ? (NSUInteger)(fBatteryLevel * 100) : 0;`
`836`	`837`	`return batteryLevel;`
`837`	`838`	`#endif`
`838`	`839`	`}`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ + (NSString *)adjust_js {`
`221`	`221`	`if (this.sdkPrefix) {`
`222`	`222`	`return this.sdkPrefix;`
`223`	`223`	`} else {`
`224`		`- return 'web-bridge4.23.0';`
	`224`	`+ return 'web-bridge4.23.1';`
`225`	`225`	`}`
`226`	`226`	`},`
`227`	`227`	`setTestOptions: function(testOptions) {`