Merge pull request #312 from adjust/v503

Version 5.0.3
adjust · Sep 17, 2024 · fe136c2 · fe136c2
2 parents d60f92e + 84519af
commit fe136c2
Show file tree

Hide file tree

Showing 28 changed files with 118 additions and 347 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,8 +1,6 @@
-[submodule "ext/android/sdk"]
-	path = ext/android/sdk
-	url = [email protected]:adjust/android_sdk.git
-	branch = master
 [submodule "ext/ios/sdk"]
 	path = ext/ios/sdk
-	url = [email protected]:adjust/ios_sdk.git
-	branch = master
+	url = https://github.com/adjust/ios_sdk.git
+[submodule "ext/android/sdk"]
+	path = ext/android/sdk
+	url = https://github.com/adjust/android_sdk.git
diff --git a/Assets/Adjust/Native/Editor/Dependencies.xml b/Assets/Adjust/Native/Editor/Dependencies.xml
@@ -7,7 +7,7 @@
         </androidPackage>
     </androidPackages>
     <iosPods>
-        <iosPod name="Adjust" version="5.0.0" minTargetSdk="12.0">
+        <iosPod name="Adjust" version="5.0.1" minTargetSdk="12.0">
         </iosPod>
     </iosPods>
-</dependencies>
+</dependencies>
diff --git a/Assets/Adjust/Scripts/AdjustAndroid.cs b/Assets/Adjust/Scripts/AdjustAndroid.cs
@@ -8,7 +8,7 @@ namespace AdjustSdk
 #if UNITY_ANDROID
     public class AdjustAndroid
     {
-        private const string sdkPrefix = "unity5.0.2";
+        private const string sdkPrefix = "unity5.0.3";
         private static bool isDeferredDeeplinkOpeningEnabled = true;
         private static AndroidJavaClass ajcAdjust = new AndroidJavaClass("com.adjust.sdk.Adjust");
         private static AndroidJavaObject ajoCurrentActivity = new AndroidJavaClass("com.unity3d.player.UnityPlayer").GetStatic<AndroidJavaObject>("currentActivity");
@@ -166,7 +166,7 @@ public static void InitSdk(AdjustConfig adjustConfig)
                 var ajoUrlStrategyDomains = new AndroidJavaObject("java.util.ArrayList");
                 foreach (string domain in adjustConfig.UrlStrategyDomains)
                 {
-                    ajoUrlStrategyDomains.Call("add", domain);
+                    ajoUrlStrategyDomains.Call<bool>("add", domain);
                 }
                 ajoAdjustConfig.Call("setUrlStrategy",
                     ajoUrlStrategyDomains,

diff --git a/Assets/Adjust/Scripts/AdjustiOS.cs b/Assets/Adjust/Scripts/AdjustiOS.cs
@@ -8,7 +8,7 @@ namespace AdjustSdk
 #if UNITY_IOS
     public class AdjustiOS
     {
-        private const string sdkPrefix = "unity5.0.2";
+        private const string sdkPrefix = "unity5.0.3";
 
         // app callbacks as method parameters
         private static List<Action<bool>> appIsEnabledGetterCallbacks;

diff --git a/Assets/Adjust/package.json b/Assets/Adjust/package.json
@@ -1,6 +1,6 @@
 {
     "name": "com.adjust.sdk",
-    "version": "5.0.2",
+    "version": "5.0.3",
     "unity": "2019.4",
     "displayName": "Adjust",
     "license": "MIT",

diff --git a/Assets/Test/Native/Android/adjust-test-library.aar b/Assets/Test/Native/Android/adjust-test-library.aar
diff --git a/Assets/Test/Native/Android/adjust-test-options.aar b/Assets/Test/Native/Android/adjust-test-options.aar
diff --git a/Assets/Test/Native/iOS/ATLControlChannel.h b/Assets/Test/Native/iOS/ATLControlChannel.h
diff --git a/Assets/Test/Native/iOS/ATLControlChannel.h.meta b/Assets/Test/Native/iOS/ATLControlChannel.h.meta
diff --git a/Assets/Test/Native/iOS/ATLControlSignal.h b/Assets/Test/Native/iOS/ATLControlSignal.h
diff --git a/Assets/Test/Native/iOS/ATLControlSignal.h.meta b/Assets/Test/Native/iOS/ATLControlSignal.h.meta
diff --git a/Assets/Test/Native/iOS/ATLNetworking.h b/Assets/Test/Native/iOS/ATLNetworking.h
@@ -0,0 +1,39 @@
+//
+//  ATLNetworking.h
+//  AdjustTestLibrary
+//
+//  Created by Pedro Silva on 24.05.24.
+//  Copyright © 2024 adjust. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface ATLHttpResponse : NSObject
+
+@property (nonatomic, nullable, strong) NSString * responseString;
+@property (nonatomic, nullable, strong) id jsonFoundation;
+@property (nonatomic, nullable, strong) NSDictionary *headerFields;
+@property (nonatomic, assign) NSInteger statusCode;
+
+@end
+
+@interface ATLHttpRequest : NSObject
+
+@property (nonatomic, nonnull, readonly, strong) NSString *path;
+@property (nonatomic, nullable, readonly, strong) NSString *base;
+@property (nonatomic, nullable, strong) NSString *bodyString;
+@property (nonatomic, nullable, strong) NSDictionary *headerFields;
+
+- (nonnull id)initWithPath:(nonnull NSString *)path
+                      base:(nullable NSString *)base;
+@end
+
+typedef void (^httpResponseHandler)(ATLHttpResponse *_Nonnull httpResponse);
+
+@interface ATLNetworking : NSObject
+
+- (void)sendPostRequestWithData:(nonnull ATLHttpRequest *)requestData
+                        baseUrl:(nonnull NSURL *)baseUrl
+                responseHandler:(nonnull httpResponseHandler)responseHandler;
+
+@end
diff --git a/Assets/Test/Native/iOS/ATLNetworking.h.meta b/Assets/Test/Native/iOS/ATLNetworking.h.meta
diff --git a/Assets/Test/Native/iOS/ATLTestInfo.h b/Assets/Test/Native/iOS/ATLTestInfo.h
diff --git a/Assets/Test/Native/iOS/ATLTestInfo.h.meta b/Assets/Test/Native/iOS/ATLTestInfo.h.meta
diff --git a/Assets/Test/Native/iOS/ATLTestLibrary.h b/Assets/Test/Native/iOS/ATLTestLibrary.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ATLUtilNetworking.h"
+#import "ATLNetworking.h"
 #import "ATLBlockingQueue.h"
 
 @protocol AdjustCommandDelegate <NSObject>
@@ -29,10 +29,6 @@
 
 - (ATLBlockingQueue *)waitControlQueue;
 
-- (id)initWithBaseUrl:(NSString *)baseUrl
-        andControlUrl:(NSString *)controlUrl
-   andCommandDelegate:(NSObject<AdjustCommandDelegate> *)commandDelegate;
-
 - (void)addTest:(NSString *)testName;
 
 - (void)addTestDirectory:(NSString *)testDirectory;
@@ -57,7 +53,4 @@
 + (ATLTestLibrary *)testLibraryWithBaseUrl:(NSString *)baseUrl
                              andControlUrl:(NSString *)controlUrl
                         andCommandDelegate:(NSObject<AdjustCommandDelegate> *)commandDelegate;
-
-+ (NSURL *)baseUrl;
-
 @end