Merge pull request #288 from adjust/v4115

V4120
adjust · Dec 13, 2017 · b07c642 · b07c642
2 parents 00bf23e + 029a0ff
commit b07c642
Show file tree

Hide file tree

Showing 46 changed files with 3,136 additions and 705 deletions.
diff --git a/Adjust/adjust/adjust-proguard-rules.txt b/Adjust/adjust/adjust-proguard-rules.txt
@@ -0,0 +1,26 @@
+-keep public class com.adjust.sdk.** { *; }
+-keep class com.google.android.gms.common.ConnectionResult {
+    int SUCCESS;
+}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {
+    com.google.android.gms.ads.identifier.AdvertisingIdClient$Info getAdvertisingIdInfo(android.content.Context);
+}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info {
+    java.lang.String getId();
+    boolean isLimitAdTrackingEnabled();
+}
+-keep class dalvik.system.VMRuntime {
+    java.lang.String getRuntime();
+}
+-keep class android.os.Build {
+    java.lang.String[] SUPPORTED_ABIS;
+    java.lang.String CPU_ABI;
+}
+-keep class android.content.res.Configuration {
+    android.os.LocaledList getLocales();
+    java.util.Locale locale;
+}
+-keep class android.os.LocaledList {
+    java.util.Locale get(int);
+}
+-keep public class com.android.installreferrer.** { *; }
diff --git a/Adjust/adjust/build.gradle b/Adjust/adjust/build.gradle
@@ -1,37 +1,43 @@
 apply plugin: 'com.android.library'
 
 def getVersionName() {
-    return "4.11.4"
+    return "4.12.0"
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName getVersionName()
+        consumerProguardFiles 'adjust-proguard-rules.txt'
     }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 }
 
-task clearJar(type: Delete) {
-    delete "build/outputs/adjust-${getVersionName()}.jar"
-}
+task makeReleaseJar(type: Copy) {
+    dependsOn 'build'
 
-task makeJar(type: Copy) {
-    from('build/intermediates/bundles/default/')
+    from('build/intermediates/bundles/release/')
     into('build/outputs/')
     include('classes.jar')
-    rename ('classes.jar', "adjust-${getVersionName()}.jar")
+    rename ('classes.jar', "adjust-${getVersionName()}-release.jar")
 }
 
-makeJar.dependsOn(clearJar, build)
+task makeDebugJar(type: Copy) {
+    dependsOn 'build'
+
+    from('build/intermediates/bundles/debug/')
+    into('build/outputs/')
+    include('classes.jar')
+    rename ('classes.jar', "adjust-${getVersionName()}-debug.jar")
+}
 
 task androidJavadocs(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs

diff --git a/Adjust/adjust/src/main/AndroidManifest.xml b/Adjust/adjust/src/main/AndroidManifest.xml
@@ -1,10 +1,14 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.adjust.sdk">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.adjust.sdk">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="25" />
-    <application />
+    <application>
+        <receiver  android:name="com.adjust.sdk.AdjustReferrerReceiver" android:exported="true">
+            <intent-filter>
+                <action android:name="com.android.vending.INSTALL_REFERRER" />
+            </intent-filter>
+        </receiver>
+    </application>
 </manifest>