Merge pull request #175 from adjust/v4212

uerceg · web-flow · commit 809e2d835ec9 · 2020-04-15T16:39:19.000+02:00
Version 4.21.2
diff --git a/Assets/Adjust/Android/AdjustAndroid.cs b/Assets/Adjust/Android/AdjustAndroid.cs
@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_ANDROID
     public class AdjustAndroid
     {
-        private const string sdkPrefix = "unity4.21.1";
+        private const string sdkPrefix = "unity4.21.2";
         private static bool launchDeferredDeeplink = true;
         private static AndroidJavaClass ajcAdjust = new AndroidJavaClass("com.adjust.sdk.Adjust");
         private static AndroidJavaObject ajoCurrentActivity = new AndroidJavaClass("com.unity3d.player.UnityPlayer").GetStatic<AndroidJavaObject>("currentActivity");
diff --git a/Assets/Adjust/Android/Test/adjust-test.jar b/Assets/Adjust/Android/Test/adjust-test.jar
diff --git a/Assets/Adjust/Android/adjust-android.jar b/Assets/Adjust/Android/adjust-android.jar
diff --git a/Assets/Adjust/Windows/AdjustWindows.cs b/Assets/Adjust/Windows/AdjustWindows.cs
@@ -17,7 +17,7 @@ namespace com.adjust.sdk
 {
     public class AdjustWindows
     {
-        private const string sdkPrefix = "unity4.21.1";
+        private const string sdkPrefix = "unity4.21.2";
         private static bool appLaunched = false;
 
         public static void Start(AdjustConfig adjustConfig)
diff --git a/Assets/Adjust/iOS/Adjust.h b/Assets/Adjust/iOS/Adjust.h
@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust
 //
-//  V4.21.1
+//  V4.21.2
 //  Created by Christian Wellenbrock (wellle) on 23rd July 2013.
 //  Copyright © 2012-2017 Adjust GmbH. All rights reserved.
 //
diff --git a/Assets/Adjust/iOS/AdjustSdk.a b/Assets/Adjust/iOS/AdjustSdk.a
diff --git a/Assets/Adjust/iOS/AdjustiOS.cs b/Assets/Adjust/iOS/AdjustiOS.cs
@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_IOS
     public class AdjustiOS
     {
-        private const string sdkPrefix = "unity4.21.1";
+        private const string sdkPrefix = "unity4.21.2";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(
diff --git a/Assets/Adjust/iOS/Test/AdjustTestLibrary.a b/Assets/Adjust/iOS/Test/AdjustTestLibrary.a
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### Version 4.21.2 (15th April 2020)
+#### Fixed
+- Added check for iOS timer source and block existence prior to starting it.
+
+#### Native SDKs
+- [iOS@v4.21.2][ios_sdk_v4.21.2]
+- [Android@v4.21.1][android_sdk_v4.21.1]
+- [Windows@v4.17.0][windows_sdk_v4.17.0]
+
+---
+
 ### Version 4.21.1 (9th April 2020)
 #### Added
 - Added support for Huawei App Gallery install referrer.
@@ -698,6 +709,7 @@
 [ios_sdk_v4.20.0]: https://github.com/adjust/ios_sdk/tree/v4.20.0
 [ios_sdk_v4.21.0]: https://github.com/adjust/ios_sdk/tree/v4.21.0
 [ios_sdk_v4.21.1]: https://github.com/adjust/ios_sdk/tree/v4.21.1
+[ios_sdk_v4.21.2]: https://github.com/adjust/ios_sdk/tree/v4.21.2
 
 [android_sdk_v3.5.0]: https://github.com/adjust/android_sdk/tree/v3.5.0
 [android_sdk_v4.1.0]: https://github.com/adjust/android_sdk/tree/v4.1.0
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.21.1
+4.21.2
diff --git a/doc/english/migration/migrate.md b/doc/english/migration/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for Unity3d to 4.21.1 from 3.4.4
+## Migrate your Adjust SDK for Unity3d to 4.21.2 from 3.4.4
 
 ### Migration procedure
 
diff --git a/ext/android/sdk b/ext/android/sdk
@@ -1 +1 @@
-Subproject commit b10a872446bf151cce569f34ff80a291c3dd9fdd
+Subproject commit 98c24f0ccf1c15128a2a5a4a52f17c5384c31783
diff --git a/ext/ios/sdk b/ext/ios/sdk
@@ -1 +1 @@
-Subproject commit 2dad132c427a9b9e8c1ea428a2ddbb4f80e45ff2
+Subproject commit e2d1c24ef39c81fe086f342803a9993c2fbd007e

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace com.adjust.sdk`
`8`	`8`	`#if UNITY_ANDROID`
`9`	`9`	`public class AdjustAndroid`
`10`	`10`	`{`
`11`		`- private const string sdkPrefix = "unity4.21.1";`
	`11`	`+ private const string sdkPrefix = "unity4.21.2";`
`12`	`12`	`private static bool launchDeferredDeeplink = true;`
`13`	`13`	`private static AndroidJavaClass ajcAdjust = new AndroidJavaClass("com.adjust.sdk.Adjust");`
`14`	`14`	`private static AndroidJavaObject ajoCurrentActivity = new AndroidJavaClass("com.unity3d.player.UnityPlayer").GetStatic<AndroidJavaObject>("currentActivity");`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace com.adjust.sdk`
`17`	`17`	`{`
`18`	`18`	`public class AdjustWindows`
`19`	`19`	`{`
`20`		`- private const string sdkPrefix = "unity4.21.1";`
	`20`	`+ private const string sdkPrefix = "unity4.21.2";`
`21`	`21`	`private static bool appLaunched = false;`
`22`	`22`
`23`	`23`	`public static void Start(AdjustConfig adjustConfig)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace com.adjust.sdk`
`8`	`8`	`#if UNITY_IOS`
`9`	`9`	`public class AdjustiOS`
`10`	`10`	`{`
`11`		`- private const string sdkPrefix = "unity4.21.1";`
	`11`	`+ private const string sdkPrefix = "unity4.21.2";`
`12`	`12`
`13`	`13`	`[DllImport("__Internal")]`
`14`	`14`	`private static extern void _AdjustLaunchApp(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## Migrate your Adjust SDK for Unity3d to 4.21.1 from 3.4.4`
	`1`	`+## Migrate your Adjust SDK for Unity3d to 4.21.2 from 3.4.4`
`2`	`2`
`3`	`3`	`### Migration procedure`
`4`	`4`