Merge pull request #631 from adjust/v510

Version 5.1.0
adjust · Jan 28, 2025 · e975ab6 · e975ab6
2 parents 942960d + 2dd75da
commit e975ab6
Show file tree

Hide file tree

Showing 32 changed files with 97 additions and 57 deletions.
diff --git a/Adjust/build.gradle b/Adjust/build.gradle
@@ -7,9 +7,9 @@ subprojects {
 ext {
     // Android config.
     coreMinSdkVersion = 21
-    coreCompileSdkVersion = 34
-    coreTargetSdkVersion = 34
-    coreVersionName = '5.0.2'
+    coreCompileSdkVersion = 35
+    coreTargetSdkVersion = 35
+    coreVersionName = '5.1.0'
     defaultVersionCode = 1
     webbridgeMinSdkVersion = 21
     samsungReferrerMinSdkVersion = 21
@@ -21,14 +21,14 @@ ext {
 }
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '2.1.0'
 
     repositories {
         mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:8.8.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files.

diff --git a/Adjust/examples/example-app-fbpixel/build.gradle b/Adjust/examples/example-app-fbpixel/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.adjust.examples"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/Adjust/examples/example-app-java/build.gradle b/Adjust/examples/example-app-java/build.gradle
@@ -7,12 +7,12 @@ repositories {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.adjust.examples"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/Adjust/examples/example-app-keyboard/build.gradle b/Adjust/examples/example-app-keyboard/build.gradle
@@ -7,12 +7,12 @@ repositories {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.adjust.examples.keyboard"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/Adjust/examples/example-app-kotlin/build.gradle b/Adjust/examples/example-app-kotlin/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.adjust.examples"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
@@ -23,6 +23,11 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
     namespace 'com.adjust.examples'
 }
 

diff --git a/Adjust/examples/example-app-tv/build.gradle b/Adjust/examples/example-app-tv/build.gradle
@@ -7,12 +7,12 @@ repositories {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.adjust.examples"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/Adjust/examples/example-app-webbridge/build.gradle b/Adjust/examples/example-app-webbridge/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.example.examples"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/Adjust/examples/example-app-webbridge/src/main/assets/AdjustExample-WebView.html b/Adjust/examples/example-app-webbridge/src/main/assets/AdjustExample-WebView.html
@@ -25,7 +25,8 @@ <h1 style="width:400px;height:35px;text-align:center;">Adjust Web View SDK Demo
                       'Campaign = ' + attribution.campaign + '\n' +
                       'Adgroup = ' + attribution.adgroup + '\n' +
                       'Creative = ' + attribution.creative + '\n' +
-                      'Click label = ' + attribution.clickLabel);
+                      'Click label = ' + attribution.clickLabel + '\n' +
+                      'Json response = ' + JSON.stringify(attribution.jsonResponse));
             }
 
             function eventSuccessCallback(eventSuccess) {
@@ -186,7 +187,8 @@ <h1 style="width:400px;height:35px;text-align:center;">Adjust Web View SDK Demo
                               'Campaign = ' + attribution.campaign + '\n' +
                               'Adgroup = ' + attribution.adgroup + '\n' +
                               'Creative = ' + attribution.creative + '\n' +
-                              'Click label = ' + attribution.clickLabel);
+                              'Click label = ' + attribution.clickLabel + '\n' +
+                              'Json response = ' + JSON.stringify(attribution.jsonResponse));
                     });
                 }
             }

diff --git a/Adjust/gradle.properties b/Adjust/gradle.properties
@@ -22,5 +22,4 @@ org.gradle.parallel=true
 org.gradle.configureondemand=true
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
-android.enableR8.fullMode=false
+android.enableR8.fullMode=true
diff --git a/Adjust/gradle/wrapper/gradle-wrapper.properties b/Adjust/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Oct 06 12:16:52 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Adjust/plugins/sdk-plugin-huawei-referrer/build.gradle b/Adjust/plugins/sdk-plugin-huawei-referrer/build.gradle
@@ -9,7 +9,7 @@ repositories {
 }
 
 android {
-    compileSdkVersion rootProject.ext.coreCompileSdkVersion
+    compileSdk rootProject.ext.coreCompileSdkVersion
     publishing {
         multipleVariants {
             allVariants()
@@ -27,7 +27,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.0.2'
+    // implementation 'com.adjust.sdk:adjust-android:5.1.0'
 }
 
 // read local properties

diff --git a/Adjust/plugins/sdk-plugin-imei/build.gradle b/Adjust/plugins/sdk-plugin-imei/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.0.2'
+    // implementation 'com.adjust.sdk:adjust-android:5.1.0'
 }
 
 // read local properties

diff --git a/Adjust/plugins/sdk-plugin-meta-referrer/build.gradle b/Adjust/plugins/sdk-plugin-meta-referrer/build.gradle
@@ -9,7 +9,7 @@ repositories {
 }
 
 android {
-    compileSdkVersion rootProject.ext.coreCompileSdkVersion
+    compileSdk rootProject.ext.coreCompileSdkVersion
     publishing {
         multipleVariants {
             allVariants()
@@ -27,7 +27,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.0.2'
+    // implementation 'com.adjust.sdk:adjust-android:5.1.0'
 }
 
 // read local properties

diff --git a/Adjust/plugins/sdk-plugin-oaid/build.gradle b/Adjust/plugins/sdk-plugin-oaid/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.0.2'
+    // implementation 'com.adjust.sdk:adjust-android:5.1.0'
     implementation 'com.huawei.hms:ads-identifier:3.4.56.300'
 }
 

diff --git a/Adjust/plugins/sdk-plugin-samsung-clouddev/build.gradle b/Adjust/plugins/sdk-plugin-samsung-clouddev/build.gradle
@@ -9,7 +9,7 @@ repositories {
 }
 
 android {
-    compileSdkVersion rootProject.ext.coreCompileSdkVersion
+    compileSdk rootProject.ext.coreCompileSdkVersion
     publishing {
         multipleVariants {
             allVariants()
@@ -27,7 +27,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.0.2'
+    // implementation 'com.adjust.sdk:adjust-android:5.1.0'
 
     // Add Samsung clouddev lib.
     compileOnly fileTree(include: ['*.aar'], dir: 'libs')

diff --git a/Adjust/plugins/sdk-plugin-samsung-referrer/build.gradle b/Adjust/plugins/sdk-plugin-samsung-referrer/build.gradle
@@ -9,7 +9,7 @@ repositories {
 }
 
 android {
-    compileSdkVersion rootProject.ext.coreCompileSdkVersion
+    compileSdk rootProject.ext.coreCompileSdkVersion
     publishing {
         multipleVariants {
             allVariants()
@@ -27,7 +27,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.0.2'
+    // implementation 'com.adjust.sdk:adjust-android:5.1.0'
 
     // Add Samsung referrer lib via Maven.
     implementation 'store.galaxy.samsung.installreferrer:samsung_galaxystore_install_referrer:3.0.1'

diff --git a/Adjust/plugins/sdk-plugin-vivo-referrer/build.gradle b/Adjust/plugins/sdk-plugin-vivo-referrer/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.0.2'
+    // implementation 'com.adjust.sdk:adjust-android:5.1.0'
 }
 
 // read local properties

diff --git a/Adjust/plugins/sdk-plugin-webbridge/build.gradle b/Adjust/plugins/sdk-plugin-webbridge/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.0.2'
+    // implementation 'com.adjust.sdk:adjust-android:5.1.0'
 }
 
 // read local properties

diff --git a/Adjust/plugins/sdk-plugin-webbridge/src/main/assets/adjust.js b/Adjust/plugins/sdk-plugin-webbridge/src/main/assets/adjust.js
@@ -259,7 +259,7 @@ var Adjust = {
         if (this.adjustConfig) {
             return this.adjustConfig.getSdkPrefix();
         } else {
-            return 'web-bridge5.0.2';
+            return 'web-bridge5.1.0';
         }
     },
 

diff --git a/...plugins/sdk-plugin-webbridge/src/main/java/com/adjust/sdk/webbridge/AdjustBridgeUtil.java b/...plugins/sdk-plugin-webbridge/src/main/java/com/adjust/sdk/webbridge/AdjustBridgeUtil.java
@@ -141,6 +141,7 @@ public void run() {
                     jsonAttribution.put("costAmount", attribution.costAmount == null || attribution.costAmount.isNaN() ? 0 : attribution.costAmount);
                     jsonAttribution.put("costCurrency", attribution.costCurrency == null ? JSONObject.NULL : attribution.costCurrency);
                     jsonAttribution.put("fbInstallReferrer", attribution.fbInstallReferrer == null ? JSONObject.NULL : attribution.fbInstallReferrer);
+                    jsonAttribution.put("jsonResponse", attribution.jsonResponse == null ? JSONObject.NULL : new JSONObject(attribution.jsonResponse));
 
                     String command = "javascript:" + commandName + "(" + jsonAttribution.toString() + ");";
                     webView.loadUrl(command);

diff --git a/Adjust/plugins/sdk-plugin-xiaomi-referrer/build.gradle b/Adjust/plugins/sdk-plugin-xiaomi-referrer/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.0.2'
+    // implementation 'com.adjust.sdk:adjust-android:5.1.0'
 
     // Add xiaomi referrer lib via Maven.
     implementation 'com.miui.referrer:homereferrer:1.0.0.6'

diff --git a/Adjust/sdk-core/build.gradle b/Adjust/sdk-core/build.gradle
@@ -220,7 +220,7 @@ def customizePomForAar(pom) {
                 dependency {
                     groupId 'com.adjust.signature'
                     artifactId 'adjust-android-signature'
-                    version '3.35.0'
+                    version '3.35.2'
                     scope 'compile'
                 }
             }

diff --git a/Adjust/sdk-core/proguard-rules.pro b/Adjust/sdk-core/proguard-rules.pro
@@ -16,7 +16,7 @@
 #   public *;
 #}
 -keep public class com.adjust.sdk.** { *; }
--keep class com.adjust.sdk.DeviceInfo**
+-keep class com.adjust.sdk.**
 -keepclassmembers class com.adjust.sdk.DeviceInfo** {*;}
 -keep class com.google.android.gms.common.ConnectionResult {
     int SUCCESS;

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java
@@ -212,23 +212,28 @@ public boolean hasPreinstallBeenRead() {
 
     // region SystemLifecycleCallback
     @Override public void onActivityLifecycle(final boolean foregroundOrElseBackground) {
-        executor.submit(() -> {
-            if (internalState.foregroundOrElseBackground != null
-              && internalState.foregroundOrElseBackground.booleanValue()
-                == foregroundOrElseBackground)
-            {
-                return;
-            }
-            // received foregroundOrElseBackground is strictly different from internal state one
+        try {
+            executor.submit(() -> {
+                if (internalState.foregroundOrElseBackground != null
+                        && internalState.foregroundOrElseBackground.booleanValue()
+                        == foregroundOrElseBackground) {
+                    return;
+                }
+                // received foregroundOrElseBackground is strictly different from internal state one
 
-            this.internalState.foregroundOrElseBackground = foregroundOrElseBackground;
+                this.internalState.foregroundOrElseBackground = foregroundOrElseBackground;
 
-            if (foregroundOrElseBackground) {
-                onResumeI();
-            } else {
-                onPauseI();
+                if (foregroundOrElseBackground) {
+                    onResumeI();
+                } else {
+                    onPauseI();
+                }
+            });
+        } catch (Exception e) {
+            if (logger != null) {
+                logger.error("Exception while executing onActivityLifecycle task");
             }
-        });
+        }
     }
     // endregion
 
@@ -420,8 +425,12 @@ public void isEnabled(OnIsEnabledListener onIsEnabledListener) {
         executor.submit(new Runnable() {
             @Override
             public void run() {
-                onIsEnabledListener.onIsEnabledRead(isEnabledI());
-            }
+                new Handler(adjustConfig.context.getMainLooper()).post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onIsEnabledListener.onIsEnabledRead(isEnabledI());
+                    }
+                });            }
         });
     }
 

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java
@@ -32,7 +32,7 @@ private Adjust() {
      */
     public static synchronized AdjustInstance getDefaultInstance() {
         @SuppressWarnings("unused")
-        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:5.0.2";
+        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:5.1.0";
 
         if (defaultInstance == null) {
             defaultInstance = new AdjustInstance();