Merge pull request #125 from adjust/v4123

Version 4.12.3

Assets/Adjust/Android/AdjustAndroid.cs

@@ -9,7 +9,7 @@ namespace com.adjust.sdk
 #if UNITY_ANDROID
     public class AdjustAndroid
     {
-        private const string sdkPrefix = "unity4.12.2";
+        private const string sdkPrefix = "unity4.12.3";
 
         private static bool launchDeferredDeeplink = true;
 

Assets/Adjust/Windows/AdjustWindows.cs

@@ -16,7 +16,7 @@ namespace com.adjust.sdk
 {
     public class AdjustWindows
     {
-        private const string sdkPrefix = "unity4.12.2";
+        private const string sdkPrefix = "unity4.12.3";
         private static bool appLaunched = false;
 
         public static void Start(AdjustConfig adjustConfig)

Assets/Adjust/iOS/Adjust.h

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust
 //
-//  V4.12.1
+//  V4.12.2
 //  Created by Christian Wellenbrock (wellle) on 23rd July 2013.
 //  Copyright © 2012-2017 Adjust GmbH. All rights reserved.
 //
@@ -11,6 +11,19 @@
 #import "ADJConfig.h"
 #import "ADJAttribution.h"
 
+@interface AdjustTestOptions : NSObject
+
+@property (nonatomic, copy, nullable) NSString *baseUrl;
+@property (nonatomic, copy, nullable) NSString *basePath;
+@property (nonatomic, copy, nullable) NSNumber *timerIntervalInMilliseconds;
+@property (nonatomic, copy, nullable) NSNumber *timerStartInMilliseconds;
+@property (nonatomic, copy, nullable) NSNumber *sessionIntervalInMilliseconds;
+@property (nonatomic, copy, nullable) NSNumber *subsessionIntervalInMilliseconds;
+@property (nonatomic, assign) BOOL teardown;
+@property (nonatomic, assign) BOOL deleteState;
+
+@end
+
 /**
  * Constants for our supported tracking environments
  */
@@ -197,14 +210,15 @@ extern NSString * __nonnull const ADJEnvironmentProduction;
  */
 + (nullable id)getInstance;
 
++ (void)setTestOptions:(nullable AdjustTestOptions *)testOptions;
 
 - (void)appDidLaunch:(nullable ADJConfig *)adjustConfig;
 
 - (void)trackEvent:(nullable ADJEvent *)event;
 
 - (void)setEnabled:(BOOL)enabled;
 
-- (void)teardown:(BOOL)deleteState;
+- (void)teardown;
 
 - (void)appWillOpenUrl:(nonnull NSURL *)url;
 

Assets/Adjust/iOS/AdjustUnity.mm

@@ -74,11 +74,11 @@ void _AdjustLaunchApp(const char* appToken,
                           int isDeviceKnown,
                           int eventBuffering,
                           int sendInBackground,
-                          long secretId,
-                          long info1,
-                          long info2,
-                          long info3,
-                          long info4,
+                          int64_t secretId,
+                          int64_t info1,
+                          int64_t info2,
+                          int64_t info3,
+                          int64_t info4,
                           double delayStart,
                           int launchDeferredDeeplink,
                           int isAttributionCallbackImplemented,

Assets/Adjust/iOS/AdjustiOS.cs

@@ -9,7 +9,7 @@ namespace com.adjust.sdk
 #if UNITY_IOS
     public class AdjustiOS
     {
-        private const string sdkPrefix = "unity4.12.2";
+        private const string sdkPrefix = "unity4.12.3";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(

CHANGELOG.md

@@ -1,3 +1,17 @@
+### Version 4.12.3 (17th February 2018)
+#### Native changes
+- https://github.com/adjust/ios_sdk/blob/master/CHANGELOG.md#version-4122-13th-february-2018
+
+#### Fixed
+- Fixed Unity and Objective-C data types alignment issues and improved support for 32-bit CPU types (https://github.com/adjust/unity_sdk/issues/123 and special thanks to @alexeSGN).
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.12.2]
+- [[email protected]][android_sdk_v4.12.1]
+- [[email protected]][windows_sdk_v4.12.0]
+
+---
+
 ### Version 4.12.2 (9th February 2018)
 #### Fixed
 - Fixed Adjust SDK behaviour once tried to be run in `Editor` - no errors displayed anymore.
@@ -433,6 +447,7 @@
 [ios_sdk_v4.11.4]: https://github.com/adjust/ios_sdk/tree/v4.11.4
 [ios_sdk_v4.11.5]: https://github.com/adjust/ios_sdk/tree/v4.11.5
 [ios_sdk_v4.12.1]: https://github.com/adjust/ios_sdk/tree/v4.12.1
+[ios_sdk_v4.12.2]: https://github.com/adjust/ios_sdk/tree/v4.12.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

VERSION

@@ -1 +1 @@
-4.12.2
+4.12.3

doc/migrate.md

@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for Unity3d to 4.12.2 from 3.4.4
+## Migrate your Adjust SDK for Unity3d to 4.12.3 from 3.4.4
 
 ### Migration procedure
 
@@ -9,7 +9,7 @@ keeping in `Assets/Plugins` folder.
 
 For migration purposes, we have prepared the Adjust SDK uninstall script written in Python (`adjust_uninstall.py`).
 
-Migration to version 4.12.2 of our SDK requires the following steps:
+Migration to version 4.12.3 of our SDK requires the following steps:
 
 1. Copy the `adjust_uninstall.py` script to your root Unity project directory and run it. This script should
 delete all adjust source files from the previous SDK version you had.