Merge pull request #633 from mindbox-cloud/release/2.14.1

Release 2.14.1

Author: AndreyEmtsov

example/app/build.gradle

@@ -87,12 +87,12 @@ dependencies {
     implementation 'com.google.firebase:firebase-analytics-ktx'
     implementation 'com.google.firebase:firebase-messaging-ktx'
     implementation 'com.huawei.hms:push:6.11.0.300'
-    implementation 'ru.rustore.sdk:pushclient:6.5.1'
+    implementation 'ru.rustore.sdk:pushclient:6.10.0'
 
     implementation 'com.google.code.gson:gson:2.11.0'
 
     //Mindbox
-    implementation 'cloud.mindbox:mobile-sdk:2.14.0'
+    implementation 'cloud.mindbox:mobile-sdk:2.14.1'
     implementation 'cloud.mindbox:mindbox-firebase'
     implementation 'cloud.mindbox:mindbox-huawei'
     implementation 'cloud.mindbox:mindbox-rustore'

gradle.properties

@@ -20,5 +20,5 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # SDK version property
-SDK_VERSION_NAME=2.14.0
+SDK_VERSION_NAME=2.14.1
 android.nonTransitiveRClass=false

gradle/libs.versions.toml

@@ -1,27 +1,27 @@
 [versions]
 compile_sdk = "35"
-build_tools = "34.0.0"
+build_tools = "35.0.0"
 min_sdk = "21"
 target_sdk = "35"
 
 mindbox_common = "1.0.2"
 
-firebase_bom = "32.7.2"
-hms_push = "6.11.0.300"
+firebase_bom = "33.7.0"
+hms_push = "6.13.0.300"
 room = "2.6.1"
 kotlin = "1.9.22"
-gradle_plugin = "8.6.0"
-gms_play_services_basement = "18.1.0"
+gradle_plugin = "8.8.0"
+gms_play_services_basement = "18.3.0"
 gms_play_services_base = "18.0.1"
 gms_play_services_ads_identifier = "18.0.1"
-google_services = "4.3.10"
-hms_ads_identifier = "3.4.39.302"
+google_services = "4.4.0"
+hms_ads_identifier = "3.4.62.300"
 kotlinx_coroutines_bom = "1.6.4"
 volley = "1.2.1"
 gson = "2.8.9"
 work_manager = "2.7.1"
 androidx_lifecycle = "2.8.7"
-androidx_core_ktx = "1.7.0"
+androidx_core_ktx = "1.13.0"
 androidx_annotations = "1.3.0"
 constraint_layout = "2.1.4"
 threetenapb = "1.4.6"
@@ -36,12 +36,12 @@ robolectric = "4.14"
 test_core = "1.5.0"
 turbine = "0.12.1"
 
-agcp = "1.6.0.300"
+agcp = "1.9.1.300"
 ktlint-plugin = "12.1.1"
 ksp = "1.9.22-1.0.17"
 maven_publish = "0.32.0"
 
-pushclient = "6.5.1"
+pushclient = "6.10.0"
 
 [bundles]
 buildscript-plugins = [

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Nov 07 16:21:11 YEKT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

modulesCommon.gradle

@@ -34,12 +34,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 
     kotlin {

sdk/consumer-rules.pro

@@ -4,5 +4,6 @@
 -keep class cloud.mindbox.mobile_sdk.MindboxConfiguration { *; }
 -keep class cloud.mindbox.mobile_sdk.pushes.PushAction { *; }
 -keep class cloud.mindbox.mobile_sdk.inapp.data** { *; }
+-keep class cloud.mindbox.mobile_sdk.inapp.domain.models** { *; }
 
 -keep public class * extends android.preference.Preference

sdk/src/main/java/cloud/mindbox/mobile_sdk/Extensions.kt

@@ -226,6 +226,10 @@ internal inline fun <reified T> Gson.fromJson(json: JsonElement?): Result<T> = r
     fromJson(json, object : TypeToken<T>() {}.type)
 }
 
+internal inline fun <reified T> Gson.fromJson(json: String?): Result<T> = runCatching {
+    fromJson(json, object : TypeToken<T>() {}.type)
+}
+
 internal fun JsonObject.getOrNull(memberName: String?): JsonElement? = runCatching {
     this.get(memberName)
 }.getOrNull()

sdk/src/main/java/cloud/mindbox/mobile_sdk/di/modules/DataModule.kt

@@ -295,6 +295,9 @@ internal fun DataModule(
                     ).registerSubtype(
                         PayloadBlankDto.SnackBarBlankDto::class.java,
                         PayloadDto.SnackbarDto.SNACKBAR_JSON_NAME
+                    ).registerSubtype(
+                        PayloadBlankDto.WebViewBlankDto::class.java,
+                        PayloadDto.WebViewDto.WEBVIEW_JSON_NAME
                     )
             ).registerTypeAdapterFactory(
                 RuntimeTypeAdapterFactory
@@ -337,6 +340,9 @@ internal fun DataModule(
                     ).registerSubtype(
                         BackgroundDto.LayerDto.ImageLayerDto::class.java,
                         BackgroundDto.LayerDto.ImageLayerDto.IMAGE_TYPE_JSON_NAME
+                    ).registerSubtype(
+                        BackgroundDto.LayerDto.WebViewLayerDto::class.java,
+                        BackgroundDto.LayerDto.WebViewLayerDto.WEBVIEW_TYPE_JSON_NAME
                     )
             ).registerTypeAdapterFactory(
                 RuntimeTypeAdapterFactory

sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/data/dto/BackgroundDto.kt

@@ -59,5 +59,20 @@ internal data class BackgroundDto(
                 }
             }
         }
+
+        internal data class WebViewLayerDto(
+            @SerializedName("baseUrl")
+            val baseUrl: String?,
+            @SerializedName("contentUrl")
+            val contentUrl: String?,
+            @SerializedName("${"$"}type")
+            val type: String?,
+            @SerializedName("params")
+            val params: Map<String, String>?,
+        ) : LayerDto() {
+            internal companion object {
+                const val WEBVIEW_TYPE_JSON_NAME = "webview"
+            }
+        }
     }
 }

sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/data/dto/FormBlankDto.kt

@@ -67,6 +67,20 @@ internal sealed class PayloadBlankDto {
             val elements: List<JsonObject?>?
         )
     }
+
+    data class WebViewBlankDto(
+        @SerializedName("content")
+        val content: ContentBlankDto?,
+        @SerializedName("${"$"}type")
+        val type: String?
+    ) : PayloadBlankDto() {
+        internal data class ContentBlankDto(
+            @SerializedName("background")
+            val background: BackgroundBlankDto?,
+            @SerializedName("elements")
+            val elements: List<JsonObject?>?
+        )
+    }
 }
 
 internal data class BackgroundBlankDto(