Release 7.7.0 (#579)

* Update to Robolectric 4.12.2 (#577)

This PR updates Robolectric to version 4.12.2. This is the latest version to support API 19.

Changes:
- Remove unnecessary shadows declaration in `@Config`.
- Replace deprecated `RuntimeEnvironment.application` with `RuntimeEnvironment.getApplication()`.
- Remove `org.robolectric:shadows-play-services` since it's not needed.
- Remove some unused imports.

* CT 7.3 support (#578)

* Set AGP to 8.6.0

Set Gradle wrapper to 8.11.1
Set Kotlin plugin to 2.0.10

* Update CleverTap version to 7.3.1

Update minSDK to 21
Update compileSDK to 35

* Ignore LeanplumLocationManagerTest in release builds

* Fix publication build script

* Update Gradle Maven publication

* Fix banner in-apps position on Android 15

* Fix in-app system bars margins

* Change Maven Central deployment from OSSRH to Portal

* Set version to 7.7.0

---------

Co-authored-by: Gaëtan Muller <[email protected]>

Author: vasct

.travis.yml

@@ -18,8 +18,8 @@ android:
     - tools
     - platform-tools
     - tools
-    - build-tools-34.0.0
-    - android-34
+    - build-tools;35.0.0
+    - platforms;android-35
     - extras;android;m2repository
    # Uncomment for snapshot tests
    #- sys-img-x86-android-22
@@ -55,7 +55,7 @@ script:
 
 before_deploy:
   - ./Tools/verifyTag.sh
-  - ./gradlew assembleRelease generatePomFileForAarPublication
+  - ./gradlew assembleRelease generatePomFileForReleasePublication
 
 after_deploy:
   - ./Tools/triggerRondo.sh
@@ -64,7 +64,15 @@ after_deploy:
 deploy:
   - provider: script
     skip_cleanup: true
-    script: ./gradlew artifactoryPublish publishAarPublicationToSonatypeRepository
+    script: ./gradlew artifactoryPublish
     dpl_version: 1.10.16
     on:
       tags: true
+
+  - provider: script
+    skip_cleanup: true
+    script: ./gradlew AndroidSDKCore:publishToMavenCentralPortal AndroidSDKPush:publishToMavenCentralPortal AndroidSDKFcm:publishToMavenCentralPortal AndroidSDKHms:publishToMavenCentralPortal AndroidSDKLocation:publishToMavenCentralPortal
+    dpl_version: 1.10.16
+    on:
+      tags: true
+      condition: $(cat sdk-version.txt) != *"beta"*

AndroidSDK/build.gradle

@@ -4,6 +4,7 @@ plugins {
     id 'com.jfrog.artifactory' version '4.25.5'
     id 'maven-publish'
     id 'signing'
+    id 'tech.yanand.maven-central-publish' version '1.3.0'
 }
 apply from: "../common-methods.gradle"
 
@@ -40,6 +41,10 @@ android {
         targetCompatibility JAVA_VERSION
     }
 
+    kotlinOptions {
+        jvmTarget = JAVA_VERSION
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'

AndroidSDKCore/build.gradle

@@ -4,6 +4,7 @@ plugins {
     id 'com.jfrog.artifactory' version '4.25.5'
     id 'maven-publish'
     id 'signing'
+    id 'tech.yanand.maven-central-publish' version '1.3.0'
 }
 apply from: "../common-methods.gradle"
 

AndroidSDKCore/src/main/java/com/leanplum/messagetemplates/controllers/BaseController.java

@@ -24,17 +24,18 @@
 import android.app.Activity;
 import android.app.Dialog;
 import android.graphics.Color;
-import android.os.Build;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
-import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.widget.RelativeLayout;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 import com.leanplum.core.R;
-import com.leanplum.messagetemplates.DialogCustomizer;
-import com.leanplum.messagetemplates.MessageTemplates;
 import com.leanplum.utils.SizeUtil;
 import com.leanplum.views.CloseButton;
 import com.leanplum.views.ViewUtils;
@@ -74,6 +75,21 @@ protected void init() {
     setContentView(contentView, contentView.getLayoutParams());
 
     contentView.setAnimation(ViewUtils.createFadeInAnimation(350));
+    ViewCompat.setOnApplyWindowInsetsListener(contentView, (v, insets) -> {
+      Insets bars = insets.getInsets(
+              WindowInsetsCompat.Type.statusBars()
+                      | WindowInsetsCompat.Type.navigationBars()
+                      | WindowInsetsCompat.Type.displayCutout()
+      );
+      LayoutParams lp = v.getLayoutParams();
+      if (lp instanceof ViewGroup.MarginLayoutParams) {
+        ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) lp;
+        mlp.bottomMargin = bars.bottom;
+        mlp.topMargin = bars.top;
+        v.setLayoutParams(lp);
+      }
+      return WindowInsetsCompat.CONSUMED;
+    });
   }
 
   private RelativeLayout createContentView() {

AndroidSDKCore/src/main/java/com/leanplum/messagetemplates/controllers/RichHtmlController.java

@@ -40,18 +40,23 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.RelativeLayout;
+
 import androidx.annotation.NonNull;
+import androidx.core.view.WindowCompat;
+
 import com.leanplum.ActionContext;
 import com.leanplum.Leanplum;
 import com.leanplum.internal.Log;
 import com.leanplum.messagetemplates.DialogCustomizer;
 import com.leanplum.messagetemplates.MessageTemplates;
 import com.leanplum.messagetemplates.options.RichHtmlOptions;
 import com.leanplum.utils.SizeUtil;
+
+import org.json.JSONObject;
+
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.Map;
-import org.json.JSONObject;
 
 /**
  * Registers a Leanplum action that displays a HTML message.
@@ -95,7 +100,10 @@ protected void applyWindowDecoration() {
       return;
     }
 
+    WindowCompat.setDecorFitsSystemWindows(window, false);
     window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+    window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+    window.setStatusBarColor(Color.TRANSPARENT);
 
     if (richOptions.isBannerWithTapOutsideFalse()) {
       // banners need to be positioned at the top manually

AndroidSDKCore/src/main/java/com/leanplum/migration/push/HmsMigrationHandler.kt

@@ -24,18 +24,29 @@ package com.leanplum.migration.push
 import android.content.Context
 import android.os.Bundle
 import com.clevertap.android.sdk.Utils
-import com.clevertap.android.sdk.pushnotification.PushConstants.PushType
 import com.clevertap.android.sdk.pushnotification.PushNotificationHandler
+import com.clevertap.android.sdk.pushnotification.PushType
+
 
 class HmsMigrationHandler internal constructor() {
 
+  companion object {
+    internal val HPS_PUSH_TYPE = PushType(
+      "hps",
+      "hps_token",
+      "com.clevertap.android.hms.HmsPushProvider",
+      "com.huawei.hms.push.HmsMessageService"
+    )
+  }
+
   fun createNotification(context: Context?, messageData: String?): Boolean {
     val messageBundle: Bundle = Utils.stringToBundle(messageData)
     val isSuccess = try {
       PushNotificationHandler.getPushNotificationHandler().onMessageReceived(
         context,
         messageBundle,
-        PushType.HPS.toString())
+        HPS_PUSH_TYPE.type
+      )
     } catch (t: Throwable) {
       t.printStackTrace()
       false
@@ -49,7 +60,7 @@ class HmsMigrationHandler internal constructor() {
       PushNotificationHandler.getPushNotificationHandler().onNewToken(
         context,
         token,
-        PushType.HPS.type
+        HPS_PUSH_TYPE
       )
       isSuccess = true
     } catch (t: Throwable) {

AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/CTWrapper.kt

@@ -158,7 +158,7 @@ internal class CTWrapper(
     val hmsToken = SharedPreferencesUtil.getString(context,
       Constants.Defaults.LEANPLUM_PUSH, Constants.Defaults.PROPERTY_HMS_TOKEN_ID)
     if (!TextUtils.isEmpty(hmsToken)) {
-      cleverTap.pushHuaweiRegistrationId(hmsToken, true)
+      cleverTap.pushRegistrationToken(hmsToken, HmsMigrationHandler.HPS_PUSH_TYPE, true)
       Log.d("Wrapper: hms token sent")
     }
   }

AndroidSDKFcm/build.gradle

@@ -4,6 +4,7 @@ plugins {
     id 'com.jfrog.artifactory' version '4.25.5'
     id 'maven-publish'
     id 'signing'
+    id 'tech.yanand.maven-central-publish' version '1.3.0'
 }
 apply from: "../common-methods.gradle"
 
@@ -28,6 +29,9 @@ android {
         sourceCompatibility JAVA_VERSION
         targetCompatibility JAVA_VERSION
     }
+    kotlinOptions {
+        jvmTarget = JAVA_VERSION
+    }
 }
 
 dependencies {

AndroidSDKHms/build.gradle

@@ -4,6 +4,7 @@ plugins {
     id 'com.jfrog.artifactory' version '4.25.5'
     id 'maven-publish'
     id 'signing'
+    id 'tech.yanand.maven-central-publish' version '1.3.0'
 }
 apply from: "../common-methods.gradle"
 
@@ -28,13 +29,17 @@ android {
         sourceCompatibility JAVA_VERSION
         targetCompatibility JAVA_VERSION
     }
+
+    kotlinOptions {
+        jvmTarget = JAVA_VERSION
+    }
 }
 
 dependencies {
     api project(':AndroidSDKCore')
     api project(':AndroidSDKPush')
 
-    implementation 'com.huawei.agconnect:agconnect-core:1.9.1.300'
+    implementation 'com.huawei.agconnect:agconnect-core:1.9.1.301'
     implementation 'com.huawei.hms:push:6.11.0.300'
 }
 

AndroidSDKLocation/build.gradle

@@ -4,6 +4,7 @@ plugins {
     id 'com.jfrog.artifactory' version '4.25.5'
     id 'maven-publish'
     id 'signing'
+    id 'tech.yanand.maven-central-publish' version '1.3.0'
 }
 apply from: "../common-methods.gradle"
 
@@ -28,13 +29,17 @@ android {
         sourceCompatibility JAVA_VERSION
         targetCompatibility JAVA_VERSION
     }
+
+    kotlinOptions {
+        jvmTarget = JAVA_VERSION
+    }
 }
 
 dependencies {
     api project(':AndroidSDKCore')
 
     // Provided dependencies are optional dependencies and will not show up in pom file.
-    compileOnly('com.google.android.gms:play-services-location:[16.0.0,)') {
+    compileOnly('com.google.android.gms:play-services-location:[21.3.0,)') {
         exclude module: 'support-v4'
     }
 }