Merge pull request #19 from adjust/play_services

Play services
adjust · Jul 28, 2014 · bb2df5a · bb2df5a
2 parents 77f65aa + 508113c
commit bb2df5a
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 7 deletions.
diff --git a/Adjust_v3.3.0.unitypackage b/Adjust_v3.3.0.unitypackage
diff --git a/Adjust_v3.4.0.unitypackage b/Adjust_v3.4.0.unitypackage
diff --git a/Assets/Adjust.cs b/Assets/Adjust.cs
@@ -14,7 +14,7 @@ public class Adjust : MonoBehaviour {
 	public AdjustUtil.AdjustEnvironment environment = AdjustUtil.AdjustEnvironment.Sandbox;
 	public bool eventBuffering = false;
 	public bool startManually = false;
-	public const string sdkPrefix = "unity3.3.0";
+	public const string sdkPrefix = "unity3.4.0";
 
 	void Awake() {
 		if (!this.startManually) {

diff --git a/Assets/Plugins/Android/adjust.jar b/Assets/Plugins/Android/adjust.jar
diff --git a/Assets/Plugins/Android/google-play-services.jar b/Assets/Plugins/Android/google-play-services.jar
diff --git a/Assets/Plugins/Android/google-play-services.jar.meta b/Assets/Plugins/Android/google-play-services.jar.meta
diff --git a/Assets/Plugins/Android/src/Adjust b/Assets/Plugins/Android/src/Adjust
diff --git a/Assets/Plugins/Android/src/com/adjust/sdk/adjust.jar b/Assets/Plugins/Android/src/com/adjust/sdk/adjust.jar
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.3.0
+3.4.0
+1 −2		.gitignore
+1 −2		Adjust/build.gradle
+ −		Adjust/libs/google-play-services.jar
+23 −13		Adjust/pom.xml
+75 −41		Adjust/src/com/adjust/sdk/ActivityHandler.java
+2 −2		Adjust/src/com/adjust/sdk/ActivityState.java
+1 −1		Adjust/src/com/adjust/sdk/Constants.java
+3 −1		Adjust/src/com/adjust/sdk/IPackageHandler.java
+16 −14		Adjust/src/com/adjust/sdk/LogCatLogger.java
+6 −6		Adjust/src/com/adjust/sdk/Logger.java
+16 −4		Adjust/src/com/adjust/sdk/PackageBuilder.java
+16 −8		Adjust/src/com/adjust/sdk/PackageHandler.java
+129 −0		Adjust/src/com/adjust/sdk/Reflection.java
+10 −10		Adjust/src/com/adjust/sdk/RequestHandler.java
+15 −16		Adjust/src/com/adjust/sdk/ResponseData.java
+64 −112		Adjust/src/com/adjust/sdk/Util.java
+10 −0		Adjust/src/com/adjust/sdk/deviceIds/AndroidIdUtil.java
+82 −0		Adjust/src/com/adjust/sdk/deviceIds/MacAddressUtil.java
+1 −1		Adjust/test/src/com/adjust/sdk/test/MockHttpClient.java
+12 −12		Adjust/test/src/com/adjust/sdk/test/MockLogger.java
+3 −1		Adjust/test/src/com/adjust/sdk/test/MockPackageHandler.java
+27 −2		Adjust/test/src/com/adjust/sdk/test/TestActivityHandler.java
+2 −2		Adjust/test/src/com/adjust/sdk/test/TestRequestHandler.java
+13 −1		README.md
+1 −1		VERSION
+11 −7		doc/google_play_services.md
+0 −14		doc/maven.md
+3 −3		doc/migrate.md
+42 −0		doc/mixpanel.md