Merge pull request #287 from adjust/v4371

uerceg · web-flow · commit 5d7de1f58e35 · 2024-02-19T16:22:32.000+01:00
Version 4.37.1
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.37.0";
+        private const string sdkPrefix = "unity4.37.1";
         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/adjust-android.jar b/Assets/Adjust/Android/adjust-android.jar
diff --git a/Assets/Adjust/Test/CommandExecutor.cs b/Assets/Adjust/Test/CommandExecutor.cs
@@ -993,10 +993,14 @@ private void VerifyPurchase()
             string productId = _command.GetFirstParameterValue("productId");
             string receipt = _command.GetFirstParameterValue("receipt");
 
+            // recreate UnityIAP base64 encoding of the receipt
+            var receiptBytes = System.Text.Encoding.UTF8.GetBytes(receipt);
+            string receiptBase64 = System.Convert.ToBase64String(receiptBytes);
+
             AdjustAppStorePurchase purchase = new AdjustAppStorePurchase(
                 transactionId,
                 productId,
-                receipt);
+                receiptBase64);
 
             Adjust.verifyAppStorePurchase(purchase, VerificationInfoCallback);
 #elif UNITY_ANDROID
diff --git a/Assets/Adjust/Unity/AdjustConfig.cs b/Assets/Adjust/Unity/AdjustConfig.cs
@@ -23,6 +23,7 @@ public class AdjustConfig
         public const string AdjustAdRevenueSourcePublisher = "publisher_sdk";
         public const string AdjustAdRevenueSourceTopOn = "topon_sdk";
         public const string AdjustAdRevenueSourceAdx = "adx_sdk";
+        public const string AdjustAdRevenueTradPlus = "tradplus_sdk";
 
         internal string appToken;
         internal string sceneName;
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.37.0";
+        private const string sdkPrefix = "unity4.37.1";
         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 SDK
 //
-//  V4.37.0
+//  V4.37.1
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //
@@ -58,6 +58,7 @@ extern NSString * __nonnull const ADJAdRevenueSourceHeliumChartboost;
 extern NSString * __nonnull const ADJAdRevenueSourcePublisher;
 extern NSString * __nonnull const ADJAdRevenueSourceTopOn;
 extern NSString * __nonnull const ADJAdRevenueSourceADX;
+extern NSString * __nonnull const ADJAdRevenueSourceTradplus;
 
 /**
  * Constants for country app's URL strategies.
diff --git a/Assets/Adjust/iOS/AdjustSdk.a b/Assets/Adjust/iOS/AdjustSdk.a
diff --git a/Assets/Adjust/iOS/AdjustUnity.mm b/Assets/Adjust/iOS/AdjustUnity.mm
@@ -863,7 +863,8 @@ void _AdjustVerifyAppStorePurchase(const char* transactionId,
 
         // Receipt.
         if (receipt != NULL) {
-            dataReceipt = [[NSString stringWithUTF8String:receipt] dataUsingEncoding:NSUTF8StringEncoding];
+            NSString *stringReceiptBase64 = [NSString stringWithUTF8String:receipt];
+            dataReceipt = [[NSData alloc] initWithBase64EncodedString:stringReceiptBase64 options:0];
         }
 
         // Scene name.
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.37.0";
+        private const string sdkPrefix = "unity4.37.1";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(
diff --git a/Assets/AdjustOaid/Android/adjust-android-oaid.jar b/Assets/AdjustOaid/Android/adjust-android-oaid.jar
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+### Version 4.37.1 (19th February 2024)
+#### Added
+- Added support for `TradPlus` ad revenue tracking.
+
+#### Changed
+- Changed the semantics of the `AdjustAppStorePurchase`'s `receipt` property to represent UnityIAP base64 encoded receipt string to avoid the need for the base64 decoding by the clients.
+
+#### Native SDKs
+- [iOS@v4.37.1][ios_sdk_v4.37.1]
+- [Android@v4.38.1][android_sdk_v4.38.1]
+- [Windows@v4.17.0][windows_sdk_v4.17.0]
+---
+
 ### Version 4.37.0 (16th January 2024)
 #### Added
 - Added ability to process shortened deep links and provide the unshortened link back as a response. You can achieve this by invoking `processDeeplink` method of the `Adjust` instance.
@@ -1198,6 +1211,7 @@ Kudos to [Ivan](https://github.com/MatkovIvan) and [Evgeny](https://github.com/e
 [ios_sdk_v4.35.2]: https://github.com/adjust/ios_sdk/tree/v4.35.2
 [ios_sdk_v4.36.0]: https://github.com/adjust/ios_sdk/tree/v4.36.0
 [ios_sdk_v4.37.0]: https://github.com/adjust/ios_sdk/tree/v4.37.0
+[ios_sdk_v4.37.1]: https://github.com/adjust/ios_sdk/tree/v4.37.1
 
 [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
@@ -1247,6 +1261,7 @@ Kudos to [Ivan](https://github.com/MatkovIvan) and [Evgeny](https://github.com/e
 [android_sdk_v4.35.1]: https://github.com/adjust/android_sdk/tree/v4.35.1
 [android_sdk_v4.37.0]: https://github.com/adjust/android_sdk/tree/v4.37.0
 [android_sdk_v4.38.0]: https://github.com/adjust/android_sdk/tree/v4.38.0
+[android_sdk_v4.38.1]: https://github.com/adjust/android_sdk/tree/v4.38.1
 
 [windows_sdk_v4.12.0]: https://github.com/adjust/windows_sdk/tree/v4.12.0
 [windows_sdk_v4.13.0]: https://github.com/adjust/windows_sdk/tree/v4.13.0
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.37.0
+4.37.1
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.37.0 from 3.4.4
+## Migrate your Adjust SDK for Unity3d to 4.37.1 from 3.4.4
 
 ### Migration procedure
 
diff --git a/ext/android/sdk b/ext/android/sdk
@@ -1 +1 @@
-Subproject commit 6b58557f18d886a1392d0cc245a90d4bca880c6e
+Subproject commit 57f4684cd7cb2253cd9d19367be2b76c0abe40b6
diff --git a/ext/ios/sdk b/ext/ios/sdk
@@ -1 +1 @@
-Subproject commit f7a0ad4a9f99fcbfc4c73dcad557ea3c86c5aaf6
+Subproject commit a6fb83bf92077660d3ee8a90d7912af642396c2e

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.37.0";`
	`11`	`+ private const string sdkPrefix = "unity4.37.1";`
`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.37.0";`
	`20`	`+ private const string sdkPrefix = "unity4.37.1";`
`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
`@@ -863,7 +863,8 @@ void _AdjustVerifyAppStorePurchase(const char* transactionId,`
`863`	`863`
`864`	`864`	`// Receipt.`
`865`	`865`	`if (receipt != NULL) {`
`866`		`- dataReceipt = [[NSString stringWithUTF8String:receipt] dataUsingEncoding:NSUTF8StringEncoding];`
	`866`	`+ NSString *stringReceiptBase64 = [NSString stringWithUTF8String:receipt];`
	`867`	`+ dataReceipt = [[NSData alloc] initWithBase64EncodedString:stringReceiptBase64 options:0];`
`867`	`868`	`}`
`868`	`869`
`869`	`870`	`// Scene name.`
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.37.0";`
	`11`	`+ private const string sdkPrefix = "unity4.37.1";`
`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.37.0 from 3.4.4`
	`1`	`+## Migrate your Adjust SDK for Unity3d to 4.37.1 from 3.4.4`
`2`	`2`
`3`	`3`	`### Migration procedure`
`4`	`4`