Merge pull request #60 from adjust/iadv3

iAd v3 support

Author: uerceg

Assets/Adjust/Android/AdjustAndroid.cs

@@ -10,7 +10,7 @@ namespace com.adjust.sdk
 #if UNITY_ANDROID
 	public class AdjustAndroid : IAdjust
 	{
-		private const string sdkPrefix = "unity4.1.1";
+		private const string sdkPrefix = "unity4.1.2";
 		private AndroidJavaClass ajcAdjust;
 		private AndroidJavaObject ajoCurrentActivity;
 		private AttributionChangeListener onAttributionChangedListener;

Assets/Adjust/Android/adjust-android.jar

@@ -9,7 +9,7 @@ namespace com.adjust.sdk
 {
 	public class AdjustMetro : IAdjust
 	{
-		private const string sdkPrefix = "unity4.1.1";
+		private const string sdkPrefix = "unity4.1.2";
 
 		public bool isEnabled()
 		{
@@ -72,4 +72,4 @@ public void setDeviceToken (string deviceToken) {}
 		public void setReferrer (string referrer) {}
 	}
 }
-#endif
+#endif

Assets/Adjust/Metro/AdjustMetro.cs

@@ -14,9 +14,6 @@ public class AdjustConfig
 		internal AdjustEnvironment environment;
 		internal Action<AdjustAttribution> attributionChangedDelegate;
 
-		// iOS specific members
-		internal bool macMd5TrackingEnabled;
-
 		// Android specific members
 		internal string processName;
 
@@ -28,7 +25,6 @@ public AdjustConfig (string appToken, AdjustEnvironment environment)
 			this.sceneName = "";
 			this.appToken = appToken;
 			this.environment = environment;
-			this.macMd5TrackingEnabled = false;
 			this.processName = "";
 		}
 
@@ -58,12 +54,6 @@ public Action<AdjustAttribution> getAttributionChangedDelegate ()
 			return this.attributionChangedDelegate;
 		}
 
-		// iOS specific methods
-		public void setMacMd5TrackingEnabled (bool macMd5TrackingEnabled)
-		{
-			this.macMd5TrackingEnabled = macMd5TrackingEnabled;
-		}
-
 		// Android specific methods
 		public void setProcessName (string processName)
 		{

Assets/Adjust/Unity/AdjustConfig.cs

@@ -9,7 +9,7 @@ namespace com.adjust.sdk
 {
 	public class AdjustWP8 : IAdjust
 	{
-		private const string sdkPrefix = "unity4.1.1";
+		private const string sdkPrefix = "unity4.1.2";
 
 		public bool isEnabled()
 		{

Assets/Adjust/WP8/AdjustWP8.cs

@@ -72,14 +72,6 @@
  */
 @property (nonatomic, assign) BOOL eventBufferingEnabled;
 
-/**
- * Disable macMd5 tracking if your privacy constraints require it.
- *
- * @param macMd5TrackingEnabled Enable or disable tracking of
- * the MD5 hash of the MAC address
- */
-@property (nonatomic, assign) BOOL macMd5TrackingEnabled;
-
 /**
  * Set the optional delegate that will inform you about attribution
  *

Assets/Adjust/iOS/ADJConfig.h

@@ -54,7 +54,7 @@ - (void)adjustAttributionChanged:(ADJAttribution *)attribution {
 
 extern "C"
 {
-    void _AdjustLaunchApp(const char* appToken, const char* environment, const char* sdkPrefix, int logLevel, int eventBuffering, int macMd5TrackingEnabled, const char* sceneName) {
+    void _AdjustLaunchApp(const char* appToken, const char* environment, const char* sdkPrefix, int logLevel, int eventBuffering, const char* sceneName) {
         NSString *stringSdkPrefix = [NSString stringWithUTF8String:sdkPrefix];
         NSString *stringAppToken = [NSString stringWithUTF8String:appToken];
         NSString *stringEnvironment = [NSString stringWithUTF8String:environment];
@@ -74,17 +74,13 @@ void _AdjustLaunchApp(const char* appToken, const char* environment, const char*
             [adjustConfig setEventBufferingEnabled:(BOOL)eventBuffering];
         }
 
-        if (macMd5TrackingEnabled != -1) {
-            [adjustConfig setMacMd5TrackingEnabled:(BOOL)macMd5TrackingEnabled];
-        }
-
         if (sceneName != NULL && [stringSceneName length] > 0) {
             adjustSceneName = strdup(sceneName);
             adjustUnityInstance = [[AdjustUnity alloc] init];
             [adjustConfig setDelegate:(id)adjustUnityInstance];
         }
 
-        NSLog(@"%@, %@, %@, %d, %d, %d, %@", stringAppToken, stringEnvironment, stringSdkPrefix, logLevel, eventBuffering, macMd5TrackingEnabled, stringSceneName);
+        NSLog(@"%@, %@, %@, %d, %d, %@", stringAppToken, stringEnvironment, stringSdkPrefix, logLevel, eventBuffering, stringSceneName);
 
         // Launch adjust instance.
         [Adjust appDidLaunch:adjustConfig];

Assets/Adjust/iOS/Adjust.a

@@ -10,12 +10,12 @@ namespace com.adjust.sdk
 #if UNITY_IOS
 	public class AdjustiOS : IAdjust
 	{
-		private const string sdkPrefix = "unity4.1.1";
+		private const string sdkPrefix = "unity4.1.2";
 
 		#region External methods
 
 		[DllImport ("__Internal")]
-		private static extern void _AdjustLaunchApp (string appToken, string environment, string sdkPrefix, int logLevel, int eventBuffering, int macMd5TrackingEnabled, string sceneName);
+		private static extern void _AdjustLaunchApp (string appToken, string environment, string sdkPrefix, int logLevel, int eventBuffering, string sceneName);
 
 		[DllImport ("__Internal")]
 		private static extern void _AdjustTrackEvent (string eventToken, double revenue, string currency, string receipt, string transactionId, int isReceiptSet, string jsonCallbackParameters, string jsonPartnerParameters);
@@ -48,9 +48,8 @@ public void start (AdjustConfig adjustConfig)
 
 			int logLevel = convertLogLevel (adjustConfig.logLevel);
 			int eventBufferingEnabled = convertBool (adjustConfig.eventBufferingEnabled);
-			int macMd5TrackingEnabled = convertBool (adjustConfig.macMd5TrackingEnabled);
 
-			_AdjustLaunchApp (appToken, environment, sdkPrefix, logLevel, eventBufferingEnabled, macMd5TrackingEnabled, sceneName);
+			_AdjustLaunchApp (appToken, environment, sdkPrefix, logLevel, eventBufferingEnabled, sceneName);
 		}
 
 		public void trackEvent (AdjustEvent adjustEvent)

Assets/Adjust/iOS/Adjust.a.meta

@@ -1,3 +1,14 @@
+### Version 4.1.2 (20th January 2016)
+### Added
+- Support for iOS iAd v3.
+
+#### Changed
+- MAC MD5 tracking feature for iOS platform is now completely removed.
+- Native iOS SDK updated to version **4.5.0**.
+- Native Android SDK updated to version **4.2.1**.
+
+---
+
 ### Version 4.1.1 (23rd December 2015)
 ### Added
 - Changelog is now added to the repository.

Assets/Adjust/iOS/AdjustSdk.a

@@ -1 +1 @@
-4.1.1
+4.1.2

Assets/Adjust/iOS/AdjustUnity.mm

@@ -1,20 +1,20 @@
-## Migrate your adjust SDK for Unity3d to 4.1.1 from 3.4.4
+## Migrate your adjust SDK for Unity3d to 4.1.2 from 3.4.4
 
 ### Migration procedure
 
-Starting from version 4.1.1, the structure of this repository is adjusted to Unity 5. All files which are part of the
+Starting from version 4.1.2, the structure of this repository is adjusted to Unity 5. All files which are part of the
 adjust SDK are now moved to the `Assets/Adjust` folder, since Unity 5 allows that native files can now be placed 
 outside of `Assets/Plugins` folder. This is done so that adjust files are no longer mixed with files you may be 
 keeping in `Assets/Plugins` folder.
 
 For migration purposes, we have prepared two Unity packages:
 
-  * `Adjust_v4.1.1_Unity_4.unitypackage` (for Unity 4 users)
-  * `Adjust_v4.1.1_Unity_5.unitypackage` (for Unity 5 users)
+  * `Adjust_v4.1.2_Unity_4.unitypackage` (for Unity 4 users)
+  * `Adjust_v4.1.2_Unity_5.unitypackage` (for Unity 5 users)
 
 and the adjust SDK uninstall script written in Python (`adjust_uninstall.py`).
 
-Migration to version 4.1.1 of our SDK requires the following steps:
+Migration to version 4.1.2 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.

Assets/Adjust/iOS/AdjustiOS.cs

@@ -5,10 +5,10 @@ default: copy
 
 build:	
 	cd $(SRCDIR); \
-	xcodebuild -target framework -configuration Release
+	xcodebuild -target AdjustStatic -configuration Release
 
 copy: build
-	cp $(SRCDIR)/Adjust.a $(LIBOUTDIR); \
+	cp $(SRCDIR)/AdjustSdk.a $(LIBOUTDIR); \
 	cp $(SRCDIR)/Headers/* $(LIBOUTDIR); \
-	rm $(SRCDIR)/Adjust.a; \
+	rm $(SRCDIR)/AdjustSdk.a; \
 	rm -rf $(SRCDIR)/Headers