Merge pull request #241 from adjust/v4104

V4104
adjust · Nov 21, 2016 · 188c621 · 188c621
2 parents 6280f7e + 120ce4b
commit 188c621
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 83 deletions.
diff --git a/Adjust/adjust/CMakeLists.txt b/Adjust/adjust/CMakeLists.txt
diff --git a/Adjust/adjust/build.gradle b/Adjust/adjust/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 def getVersionName() {
-    return "4.10.3"
+    return "4.10.4"
 }
 
 android {
@@ -13,16 +13,6 @@ android {
         targetSdkVersion 25
         versionCode 1
         versionName getVersionName()
-        externalNativeBuild {
-            cmake {
-                cppFlags ""
-            }
-        }
-    }
-    externalNativeBuild {
-        cmake {
-            path "CMakeLists.txt"
-        }
     }
 }
 

diff --git a/Adjust/adjust/src/main/cpp/native-lib.cpp b/Adjust/adjust/src/main/cpp/native-lib.cpp
diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java b/Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java
@@ -29,7 +29,7 @@ public interface Constants {
     String BASE_URL = "https://app.adjust.com";
     String SCHEME = "https";
     String AUTHORITY = "app.adjust.com";
-    String CLIENT_SDK = "android4.10.3";
+    String CLIENT_SDK = "android4.10.4";
     String LOGTAG = "Adjust";
     String REFTAG = "reftag";
     String DEEPLINK = "deeplink";

diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/DeviceInfo.java b/Adjust/adjust/src/main/java/com/adjust/sdk/DeviceInfo.java
@@ -292,12 +292,6 @@ private String getABI() {
 
     private String getVmInstructionSet() {
         String instructionSet = Util.getVmInstructionSet();
-        if (instructionSet == null) {
-            System.loadLibrary("native-lib");
-            instructionSet = nativeISA();
-        }
         return instructionSet;
     }
-
-    private native String nativeISA();
 }
diff --git a/Adjust/example/build.gradle b/Adjust/example/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     // running mvn package
     //compile fileTree(dir: '../target', include: ['*.jar'])
     // using maven repository
-    //compile 'com.adjust.sdk:adjust-android:4.10.3'
+    //compile 'com.adjust.sdk:adjust-android:4.10.4'
 
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'

diff --git a/Adjust/pom.xml b/Adjust/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>adjust-android</artifactId>
     <groupId>com.adjust.sdk</groupId>
-    <version>4.10.3</version>
+    <version>4.10.4</version>
     <packaging>jar</packaging>
     <name>Adjust Android SDK</name>
     <url>https://github.com/adjust/android_sdk</url>

diff --git a/Adjust/pom_criteo.xml b/Adjust/pom_criteo.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>adjust-android-criteo</artifactId>
     <groupId>com.adjust.sdk</groupId>
-    <version>4.10.3</version>
+    <version>4.10.4</version>
     <packaging>jar</packaging>
     <name>Adjust Android SDK</name>
     <url>https://github.com/adjust/android_sdk</url>

diff --git a/Adjust/pom_sociomantic.xml b/Adjust/pom_sociomantic.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>adjust-android-sociomantic</artifactId>
     <groupId>com.adjust.sdk</groupId>
-    <version>4.10.3</version>
+    <version>4.10.4</version>
     <packaging>jar</packaging>
     <name>Adjust Android SDK</name>
     <url>https://github.com/adjust/android_sdk</url>

diff --git a/Adjust/pom_trademob.xml b/Adjust/pom_trademob.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>adjust-android-trademob</artifactId>
     <groupId>com.adjust.sdk</groupId>
-    <version>4.10.3</version>
+    <version>4.10.4</version>
     <packaging>jar</packaging>
     <name>Adjust Android SDK</name>
     <url>https://github.com/adjust/android_sdk</url>

diff --git a/Adjust/test/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java b/Adjust/test/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java
@@ -53,7 +53,7 @@ public TestActivityPackage(ActivityPackage activityPackage) {
         // default values
         appToken = "123456789012";
         environment = "sandbox";
-        clientSdk = "android4.10.3";
+        clientSdk = "android4.10.4";
         suffix = "";
         attribution = new AdjustAttribution();
         playServices = true;

diff --git a/README.md b/README.md
@@ -97,7 +97,7 @@ compile project(":adjust")
 If you are using Maven, add this line instead:
 
 ```
-compile 'com.adjust.sdk:adjust-android:4.10.3'
+compile 'com.adjust.sdk:adjust-android:4.10.4'
 ```
 
 ### <a id="sdk-gps"></a>Add Google Play Services

diff --git a/doc/english/criteo_plugin.md b/doc/english/criteo_plugin.md
@@ -3,7 +3,7 @@
 Add the dependency of the adjust sdk with the Criteo plugin:
 
 ```
-compile 'com.adjust.sdk:adjust-android-criteo:4.10.3'
+compile 'com.adjust.sdk:adjust-android-criteo:4.10.4'
 ```
 
 Or integrate adjust with Criteo events by following these steps:

diff --git a/doc/english/migrate.md b/doc/english/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for Android to 4.10.3 from 3.6.2
+## Migrate your adjust SDK for Android to 4.10.4 from 3.6.2
 
 ### The Application class
 

diff --git a/doc/english/sociomantic_plugin.md b/doc/english/sociomantic_plugin.md
@@ -3,7 +3,7 @@
 Add the dependency of the adjust sdk with the Sociomantic plugin:
 
 ```
-compile 'com.adjust.sdk:adjust-android-sociomantic:4.10.3'
+compile 'com.adjust.sdk:adjust-android-sociomantic:4.10.4'
 ```
 
 Or integrate adjust with Sociomantic events by following these steps:

diff --git a/doc/english/trademob_plugin.md b/doc/english/trademob_plugin.md
@@ -3,7 +3,7 @@
 Add the dependency of the adjust sdk with the Trademob plugin:
 
 ```
-compile 'com.adjust.sdk:adjust-android-trademob:4.10.3'
+compile 'com.adjust.sdk:adjust-android-trademob:4.10.4'
 ```
 
 Or integrate adjust with Trademob events by following these steps: