Merge pull request #175 from adjust/v4212

Version 4.21.2
adjust · Apr 15, 2020 · 809e2d8 · 809e2d8
2 parents 6736202 + fd355fe
commit 809e2d8
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 8 deletions.
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
diff --git a/ext/ios/sdk b/ext/ios/sdk
+5 −0		doc/chinese/README.md
+5 −0		doc/japanese/README.md
+5 −0		doc/korean/README.md
+2 −2		Adjust.podspec
+27 −18		Adjust/ADJActivityHandler.m
+3 −2		Adjust/ADJAdditions/UIDevice+ADJAdditions.m
+9 −0		Adjust/ADJTimerOnce.m
+30 −29		Adjust/ADJUtil.m
+1 −1		Adjust/Adjust.h
+1 −1		AdjustBridge/AdjustBridgeRegister.m
+1 −1		AdjustTests/AdjustUnitTests/ADJPackageFields.m
+6 −0		CHANGELOG.md
+2 −2		README.md
+1 −1		VERSION
+2 −2		doc/chinese/README.md
+1 −1		doc/english/migrate.md
+1 −1		doc/english/web_views.md
+2 −2		doc/japanese/README.md
+2 −2		doc/korean/README.md
+1 −1		doc/korean/web_views.md
+1 −1		doc/migrate.md