Merge pull request #47 from adjust/unity_sync

Uglješa Erceg · Uglješa Erceg · commit 04fc4680c00f · 2015-08-03T17:50:17.000+02:00
Unity sync
diff --git a/Assets/Adjust/Adjust.cs b/Assets/Adjust/Adjust.cs
@@ -7,8 +7,7 @@ namespace com.adjust.sdk
 {
 	public class Adjust : MonoBehaviour
 	{
-		private const string sdkPrefix = "unity4.0.1";
-		private const string errorMessage = "adjust: SDK not started. Start it manually using the 'appDidLaunch' method.";
+		private const string errorMessage = "adjust: SDK not started. Start it manually using the 'start' method.";
 
 		private static IAdjust instance = null;
 		private static Action<AdjustAttribution> attributionChangedDelegate = null;
@@ -39,7 +38,8 @@ void Awake ()
 			}
 		}
 
-		void OnApplicationPause(bool pauseStatus) {
+		void OnApplicationPause(bool pauseStatus) 
+		{
 			if (Adjust.instance == null) {
 				return;
 			}
@@ -82,7 +82,6 @@ public static void start (AdjustConfig adjustConfig)
 				return;
 			}
 
-			adjustConfig.setSdkPrefix(Adjust.sdkPrefix);
 			Adjust.attributionChangedDelegate = adjustConfig.getAttributionChangedDelegate ();
 
 			Adjust.instance.start (adjustConfig);
@@ -103,7 +102,8 @@ public static void trackEvent (AdjustEvent adjustEvent)
 			Adjust.instance.trackEvent (adjustEvent);
 		}
 
-		public static void setEnabled(bool enabled) {
+		public static void setEnabled(bool enabled) 
+		{
 			if (Adjust.instance == null) {
 				Debug.Log(Adjust.errorMessage);
 				return;
@@ -112,7 +112,8 @@ public static void setEnabled(bool enabled) {
 			Adjust.instance.setEnabled(enabled);
 		}
 		
-		public static bool isEnabled() {
+		public static bool isEnabled() 
+		{
 			if (Adjust.instance == null) {
 				Debug.Log(Adjust.errorMessage);
 				return false;
@@ -121,7 +122,8 @@ public static bool isEnabled() {
 			return Adjust.instance.isEnabled();
 		}
 		
-		public static void setOfflineMode(bool enabled) {
+		public static void setOfflineMode(bool enabled) 
+		{
 			if (Adjust.instance == null) {
 				Debug.Log(Adjust.errorMessage);
 				return;
diff --git a/Assets/Adjust/Android/AdjustAndroid.cs b/Assets/Adjust/Android/AdjustAndroid.cs
@@ -10,6 +10,7 @@ namespace com.adjust.sdk
 #if UNITY_ANDROID
 	public class AdjustAndroid : IAdjust
 	{
+		private const string sdkPrefix = "unity4.0.2";
 		private AndroidJavaClass ajcAdjust;
 		private AndroidJavaObject ajoCurrentActivity;
 		private AttributionChangeListener onAttributionChangedListener;
@@ -80,9 +81,13 @@ public void start (AdjustConfig adjustConfig)
 				ajoAdjustConfig.Call ("setOnAttributionChangedListener", onAttributionChangedListener);
 			}
 
-			ajoAdjustConfig.Call ("setSdkPrefix", adjustConfig.sdkPrefix);
+			ajoAdjustConfig.Call ("setSdkPrefix", sdkPrefix);
 			
 			ajcAdjust.CallStatic ("onCreate", ajoAdjustConfig);
+
+			if (adjustConfig.startAutomatically == true) {
+				ajcAdjust.CallStatic ("onResume");
+			}
 		}
 
 		public void trackEvent (AdjustEvent adjustEvent)
@@ -119,11 +124,12 @@ public bool isEnabled ()
 			return ajcAdjust.CallStatic<bool> ("isEnabled");
 		}
 
-		public void setEnabled(bool enabled) {
+		public void setEnabled (bool enabled) 
+		{
 			ajcAdjust.CallStatic ("setEnabled", enabled);
 		}
 
-		public void setOfflineMode(bool enabled)
+		public void setOfflineMode (bool enabled)
 		{
 			ajcAdjust.CallStatic ("setOfflineMode", enabled);
 		}
diff --git a/Assets/Adjust/Android/adjust-android.jar b/Assets/Adjust/Android/adjust-android.jar
diff --git a/Assets/Adjust/Android/adjust-android.jar.meta b/Assets/Adjust/Android/adjust-android.jar.meta
diff --git a/Assets/Adjust/ExampleGUI/ExampleGUI.cs b/Assets/Adjust/ExampleGUI/ExampleGUI.cs
@@ -26,6 +26,7 @@ void OnGUI ()
 		if (GUI.Button (new Rect (0, Screen.height * 0 / nr_buttons, Screen.width, Screen.height / nr_buttons), txtManualLaunch)) {
 			if (!string.Equals(txtManualLaunch, "SDK Launched", StringComparison.OrdinalIgnoreCase)) {
 				AdjustConfig adjustConfig = new AdjustConfig ("{YourAppToken}", AdjustEnvironment.Sandbox);
+				adjustConfig.setStartAutomatically(true);
 				adjustConfig.setLogLevel (AdjustLogLevel.Verbose);
 				adjustConfig.setAttributionChangedDelegate (this.attributionChangedDelegate);
 				
diff --git a/Assets/Adjust/Unity/AdjustConfig.cs b/Assets/Adjust/Unity/AdjustConfig.cs
@@ -6,9 +6,11 @@ public class AdjustConfig
 	{
 		internal string appToken;
 		internal string sceneName;
-		internal string sdkPrefix;
 		internal string defaultTracker;
+
+		internal bool? startAutomatically;
 		internal bool? eventBufferingEnabled;
+
 		internal AdjustLogLevel? logLevel;
 		internal AdjustEnvironment environment;
 		internal Action<AdjustAttribution> attributionChangedDelegate;
@@ -18,16 +20,17 @@ public AdjustConfig (string appToken, AdjustEnvironment environment)
 			this.sceneName = "";
 			this.appToken = appToken;
 			this.environment = environment;
+			this.startAutomatically = false;
 		}
 
-		public void setSdkPrefix (string sdkPrefix)
+		public void setLogLevel (AdjustLogLevel logLevel)
 		{
-			this.sdkPrefix = sdkPrefix;
+			this.logLevel = logLevel;
 		}
 
-		public void setLogLevel (AdjustLogLevel logLevel)
+		public void setStartAutomatically (bool shouldStartAutomatically)
 		{
-			this.logLevel = logLevel;
+			this.startAutomatically = shouldStartAutomatically;
 		}
 
 		public void setDefaultTracker (string defaultTracker)
diff --git a/Assets/Adjust/iOS/Adjust.a b/Assets/Adjust/iOS/Adjust.a
diff --git a/Assets/Adjust/iOS/AdjustiOS.cs b/Assets/Adjust/iOS/AdjustiOS.cs
@@ -10,6 +10,8 @@ namespace com.adjust.sdk
 #if UNITY_IOS
 	public class AdjustiOS : IAdjust
 	{
+		private const string sdkPrefix = "unity4.0.2";
+
 		#region External methods
 
 		[DllImport ("__Internal")]
@@ -27,18 +29,17 @@ public class AdjustiOS : IAdjust
 		[DllImport ("__Internal")]
 		private static extern void _AdjustSetOfflineMode (int enabled);
 
+		#endregion
+
 		public AdjustiOS ()
 		{
 		}
 
-		#endregion
-
 		#region Public methods
 
 		public void start (AdjustConfig adjustConfig)
 		{
 			string appToken = adjustConfig .appToken;
-			string sdkPrefix = adjustConfig.sdkPrefix;
 			string sceneName = adjustConfig.sceneName;
 			string environment = adjustConfig.environment.ToString ().ToLower ();
 
diff --git a/Assets/Editor/PostprocessBuildPlayer_AdjustPostBuildiOS b/Assets/Editor/PostprocessBuildPlayer_AdjustPostBuildiOS
@@ -89,7 +89,7 @@ def edit_unity_xcode_project(Log, unity_xcode_project_path, framework_path):
     #             build_file.add_compiler_flag('-fobjc-arc')
     #             Log("added ARC flag to file {0}", name)
 
-    unity_XcodeProject.add_other_ldflags('-all_load')
+    unity_XcodeProject.add_other_ldflags('-ObjC')
 
     # save changes
     unity_XcodeProject.saveFormat3_2()
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.0.1
+4.0.2
diff --git a/doc/migrate.md b/doc/migrate.md
@@ -1,22 +1,22 @@
-## Migrate your adjust SDK for Unity3d to 4.0.1 from 3.4.4
+## Migrate your adjust SDK for Unity3d to 4.0.2 from 3.4.4
 
-N.B. At the moment, SDK 4.0.1 for Unity supports Android and iOS, but not Windows. If you are planning to release your Unity app on Windows, please migrate to 4.0.1 only when we add full support for Windows.
+N.B. At the moment, SDK 4.0.2 for Unity supports Android and iOS, but not Windows. If you are planning to release your Unity app on Windows, please migrate to 4.0.2 only when we add full support for Windows.
 
 ### Migration procedure
 
-Starting from version 4.0.1, the structure of this repository is adjusted to Unity 5. All files which are part of the
+Starting from version 4.0.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.0.1_Unity_4.unitypackage` (for Unity 4 users)
-  * `Adjust_v4.0.1_Unity_5.unitypackage` (for Unity 5 users)
+  * `Adjust_v4.0.2_Unity_4.unitypackage` (for Unity 4 users)
+  * `Adjust_v4.0.2_Unity_5.unitypackage` (for Unity 5 users)
   
 and the adjust SDK uninstall script written in Python (`adjust_uninstall.py`).
 
-Migration to version 4.0.1 of our SDK requires the following steps:
+Migration to version 4.0.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.
diff --git a/ext/Android/Makefile b/ext/Android/Makefile
@@ -1,6 +1,6 @@
 MVNDIR = ./sdk/Adjust
 JARINDIR = ./sdk/Adjust/target
-JAROUTDIR = ../../Assets/Plugins/Android
+JAROUTDIR = ../../Assets/Adjust/Android
 
 default: copy
 
diff --git a/ext/Android/sdk b/ext/Android/sdk
@@ -1 +1 @@
-Subproject commit 18d8932cad3d2f9ebfaee1ac5223ed9b29c690bb
+Subproject commit 953e592c22e2f54da7e2164ae5597b252bc08157
diff --git a/ext/iOS/Makefile b/ext/iOS/Makefile
@@ -1,5 +1,5 @@
 SRCDIR = ./sdk
-LIBOUTDIR = ../../Assets/Plugins/iOS
+LIBOUTDIR = ../../Assets/Adjust/iOS
 
 default: copy
 
diff --git a/ext/iOS/sdk b/ext/iOS/sdk
@@ -1 +1 @@
-Subproject commit 952fb51bbf8cba91719713bd082497d357de0b54
+Subproject commit 197d0efc5fc4877507c85ab243fb1afa48366064

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,7 @@ namespace com.adjust.sdk`
`7`	`7`	`{`
`8`	`8`	`public class Adjust : MonoBehaviour`
`9`	`9`	`{`
`10`		`- private const string sdkPrefix = "unity4.0.1";`
`11`		`- private const string errorMessage = "adjust: SDK not started. Start it manually using the 'appDidLaunch' method.";`
	`10`	`+ private const string errorMessage = "adjust: SDK not started. Start it manually using the 'start' method.";`
`12`	`11`
`13`	`12`	`private static IAdjust instance = null;`
`14`	`13`	`private static Action<AdjustAttribution> attributionChangedDelegate = null;`
`@@ -39,7 +38,8 @@ void Awake ()`
`39`	`38`	`}`
`40`	`39`	`}`
`41`	`40`
`42`		`- void OnApplicationPause(bool pauseStatus) {`
	`41`	`+ void OnApplicationPause(bool pauseStatus)`
	`42`	`+ {`
`43`	`43`	`if (Adjust.instance == null) {`
`44`	`44`	`return;`
`45`	`45`	`}`
`@@ -82,7 +82,6 @@ public static void start (AdjustConfig adjustConfig)`
`82`	`82`	`return;`
`83`	`83`	`}`
`84`	`84`
`85`		`- adjustConfig.setSdkPrefix(Adjust.sdkPrefix);`
`86`	`85`	`Adjust.attributionChangedDelegate = adjustConfig.getAttributionChangedDelegate ();`
`87`	`86`
`88`	`87`	`Adjust.instance.start (adjustConfig);`
`@@ -103,7 +102,8 @@ public static void trackEvent (AdjustEvent adjustEvent)`
`103`	`102`	`Adjust.instance.trackEvent (adjustEvent);`
`104`	`103`	`}`
`105`	`104`
`106`		`- public static void setEnabled(bool enabled) {`
	`105`	`+ public static void setEnabled(bool enabled)`
	`106`	`+ {`
`107`	`107`	`if (Adjust.instance == null) {`
`108`	`108`	`Debug.Log(Adjust.errorMessage);`
`109`	`109`	`return;`
`@@ -112,7 +112,8 @@ public static void setEnabled(bool enabled) {`
`112`	`112`	`Adjust.instance.setEnabled(enabled);`
`113`	`113`	`}`
`114`	`114`
`115`		`- public static bool isEnabled() {`
	`115`	`+ public static bool isEnabled()`
	`116`	`+ {`
`116`	`117`	`if (Adjust.instance == null) {`
`117`	`118`	`Debug.Log(Adjust.errorMessage);`
`118`	`119`	`return false;`
`@@ -121,7 +122,8 @@ public static bool isEnabled() {`
`121`	`122`	`return Adjust.instance.isEnabled();`
`122`	`123`	`}`
`123`	`124`
`124`		`- public static void setOfflineMode(bool enabled) {`
	`125`	`+ public static void setOfflineMode(bool enabled)`
	`126`	`+ {`
`125`	`127`	`if (Adjust.instance == null) {`
`126`	`128`	`Debug.Log(Adjust.errorMessage);`
`127`	`129`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ namespace com.adjust.sdk`
`10`	`10`	`#if UNITY_ANDROID`
`11`	`11`	`public class AdjustAndroid : IAdjust`
`12`	`12`	`{`
	`13`	`+ private const string sdkPrefix = "unity4.0.2";`
`13`	`14`	`private AndroidJavaClass ajcAdjust;`
`14`	`15`	`private AndroidJavaObject ajoCurrentActivity;`
`15`	`16`	`private AttributionChangeListener onAttributionChangedListener;`
`@@ -80,9 +81,13 @@ public void start (AdjustConfig adjustConfig)`
`80`	`81`	`ajoAdjustConfig.Call ("setOnAttributionChangedListener", onAttributionChangedListener);`
`81`	`82`	`}`
`82`	`83`
`83`		`- ajoAdjustConfig.Call ("setSdkPrefix", adjustConfig.sdkPrefix);`
	`84`	`+ ajoAdjustConfig.Call ("setSdkPrefix", sdkPrefix);`
`84`	`85`
`85`	`86`	`ajcAdjust.CallStatic ("onCreate", ajoAdjustConfig);`
	`87`	`+`
	`88`	`+ if (adjustConfig.startAutomatically == true) {`
	`89`	`+ ajcAdjust.CallStatic ("onResume");`
	`90`	`+ }`
`86`	`91`	`}`
`87`	`92`
`88`	`93`	`public void trackEvent (AdjustEvent adjustEvent)`
`@@ -119,11 +124,12 @@ public bool isEnabled ()`
`119`	`124`	`return ajcAdjust.CallStatic<bool> ("isEnabled");`
`120`	`125`	`}`
`121`	`126`
`122`		`- public void setEnabled(bool enabled) {`
	`127`	`+ public void setEnabled (bool enabled)`
	`128`	`+ {`
`123`	`129`	`ajcAdjust.CallStatic ("setEnabled", enabled);`
`124`	`130`	`}`
`125`	`131`
`126`		`- public void setOfflineMode(bool enabled)`
	`132`	`+ public void setOfflineMode (bool enabled)`
`127`	`133`	`{`
`128`	`134`	`ajcAdjust.CallStatic ("setOfflineMode", enabled);`
`129`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,11 @@ public class AdjustConfig`
`6`	`6`	`{`
`7`	`7`	`internal string appToken;`
`8`	`8`	`internal string sceneName;`
`9`		`- internal string sdkPrefix;`
`10`	`9`	`internal string defaultTracker;`
	`10`	`+`
	`11`	`+ internal bool? startAutomatically;`
`11`	`12`	`internal bool? eventBufferingEnabled;`
	`13`	`+`
`12`	`14`	`internal AdjustLogLevel? logLevel;`
`13`	`15`	`internal AdjustEnvironment environment;`
`14`	`16`	`internal Action<AdjustAttribution> attributionChangedDelegate;`
`@@ -18,16 +20,17 @@ public AdjustConfig (string appToken, AdjustEnvironment environment)`
`18`	`20`	`this.sceneName = "";`
`19`	`21`	`this.appToken = appToken;`
`20`	`22`	`this.environment = environment;`
	`23`	`+ this.startAutomatically = false;`
`21`	`24`	`}`
`22`	`25`
`23`		`- public void setSdkPrefix (string sdkPrefix)`
	`26`	`+ public void setLogLevel (AdjustLogLevel logLevel)`
`24`	`27`	`{`
`25`		`- this.sdkPrefix = sdkPrefix;`
	`28`	`+ this.logLevel = logLevel;`
`26`	`29`	`}`
`27`	`30`
`28`		`- public void setLogLevel (AdjustLogLevel logLevel)`
	`31`	`+ public void setStartAutomatically (bool shouldStartAutomatically)`
`29`	`32`	`{`
`30`		`- this.logLevel = logLevel;`
	`33`	`+ this.startAutomatically = shouldStartAutomatically;`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`public void setDefaultTracker (string defaultTracker)`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ namespace com.adjust.sdk`
`10`	`10`	`#if UNITY_IOS`
`11`	`11`	`public class AdjustiOS : IAdjust`
`12`	`12`	`{`
	`13`	`+ private const string sdkPrefix = "unity4.0.2";`
	`14`	`+`
`13`	`15`	`#region External methods`
`14`	`16`
`15`	`17`	`[DllImport ("__Internal")]`
`@@ -27,18 +29,17 @@ public class AdjustiOS : IAdjust`
`27`	`29`	`[DllImport ("__Internal")]`
`28`	`30`	`private static extern void _AdjustSetOfflineMode (int enabled);`
`29`	`31`
	`32`	`+ #endregion`
	`33`	`+`
`30`	`34`	`public AdjustiOS ()`
`31`	`35`	`{`
`32`	`36`	`}`
`33`	`37`
`34`		`- #endregion`
`35`		`-`
`36`	`38`	`#region Public methods`
`37`	`39`
`38`	`40`	`public void start (AdjustConfig adjustConfig)`
`39`	`41`	`{`
`40`	`42`	`string appToken = adjustConfig .appToken;`
`41`		`- string sdkPrefix = adjustConfig.sdkPrefix;`
`42`	`43`	`string sceneName = adjustConfig.sceneName;`
`43`	`44`	`string environment = adjustConfig.environment.ToString ().ToLower ();`
`44`	`45`