Merge pull request #47 from adjust/maven_play_services

Maven play services

Author: nonelse

Adjust/build.gradle

@@ -25,7 +25,7 @@ android {
   compileSdkVersion 19
   defaultConfig {
     versionCode 11
-    versionName '3.3.1'
+    versionName '3.3.2'
     minSdkVersion 8
     targetSdkVersion 19
   }

Adjust/pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>adjust-android</artifactId>
   <groupId>com.adjust.sdk</groupId>
-  <version>3.3.1</version>
+  <version>3.3.2</version>
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -19,6 +19,18 @@
       <groupId>com.google.android</groupId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+        <groupId>com.google.android.gms</groupId>
+        <artifactId>google-play-services</artifactId>
+        <version>4.3.23</version>
+        <type>apklib</type>
+    </dependency>
+    <dependency>
+        <groupId>com.google.android.gms</groupId>
+        <artifactId>google-play-services</artifactId>
+        <version>4.3.23</version>
+        <type>jar</type>
+    </dependency>
   </dependencies>
   <build>
     <sourceDirectory>src</sourceDirectory>

Adjust/src/com/adjust/sdk/Constants.java

@@ -18,8 +18,8 @@ public interface Constants {
     int ONE_MINUTE     = 60 * ONE_SECOND;
     int THIRTY_MINUTES = 30 * ONE_MINUTE;
 
-    String BASE_URL   = "https://app.adjust.io";
-    String CLIENT_SDK = "android3.3.1";
+    String BASE_URL   = "https://stage.adjust.io";
+    String CLIENT_SDK = "android3.3.2";
     String LOGTAG     = "Adjust";
 
     String SESSION_STATE_FILENAME    = "AdjustIoActivityState";

Adjust/test/src/com/adjust/sdk/test/TestActivityHandler.java

@@ -92,7 +92,7 @@ public void testFirstSession() {
 
         // check the Sdk version is being tested
         assertEquals(activityPackage.getExtendedString(),
-            "android3.3.1", activityPackage.getClientSdk());
+            "android3.3.2", activityPackage.getClientSdk());
 
         Map<String, String> parameters = activityPackage.getParameters();
 

VERSION

@@ -1 +1 @@
-3.3.1
+3.3.2

doc/maven.md

@@ -0,0 +1,14 @@
+## Build adjust using Maven
+
+We started using Google Play Services to obtain the advertising ID if the user didn’t opt out.
+Because this library is not present in the Maven public repository it's necessary to import it manually.
+
+Add the following command to your maven install build.
+```
+mvn install:install-file \
+-DgroupId=com.google.android.gms \
+-DartifactId=google-play-services \
+-Dversion=4.3.23 \
+-Dpackaging=jar \
+-Dfile=libs/google-play-services.jar
+```

doc/migrate.md

@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for Android to 3.3.1 from v2.1.x
+## Migrate your adjust SDK for Android to 3.3.2 from v2.1.x
 
 We renamed the main class `com.adeven.adjustio.AdjustIo` to
 `com.adjust.sdk.Adjust`. Follow these steps to update all adjust SDK calls.
@@ -24,7 +24,7 @@ We renamed the main class `com.adeven.adjustio.AdjustIo` to
 4. In the same fashion, replace `adeven.adjustio` with `adjust.sdk` in all
    manifest files to update the package name of the `ReferrerReceiver`.
 
-5. Download version v3.3.1 and create a new Android project from the `Adjust` folder.
+5. Download version v3.3.2 and create a new Android project from the `Adjust` folder.
 
     ![][import]
 
@@ -36,7 +36,7 @@ We renamed the main class `com.adeven.adjustio.AdjustIo` to
 
 8. Build your project to confirm that everything is properly connected again.
 
-The adjust SDK v3.3.1 added delegate notifications. Check out the [README] for
+The adjust SDK v3.3.2 added delegate notifications. Check out the [README] for
 details.