Merge pull request #500 from mindbox-cloud/release/2.11.1

Release 2.11.1

Author: AndreyEmtsov

.github/workflows/deploy.yml

@@ -1,4 +1,4 @@
-name: SDK Distribute
+name: Distribute PushOk
 
 on:
   pull_request:
@@ -14,11 +14,19 @@ jobs:
     if: github.event.pull_request.merged == true || (github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release/'))
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Get last 3 commit messages
+        run: |
+          commits=$(git log -3 --pretty=format:"%s")
+          echo "commits=$commits" >> $GITHUB_ENV 
+
       - name: trigger build & send to FAD
         uses: benc-uk/workflow-dispatch@v1
-        with:
+        with: 
           workflow: 61033697
           repo: mindbox-cloud/android-app
           ref: develop
           token: ${{ secrets.GITHUBACCESSTOKEN }}
-
+          inputs: '{"branch": "${{ github.head_ref }}", "commits": "${{ env.commits }}"}'

build.gradle

@@ -1,20 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.8.21"
     repositories {
         google()
         mavenCentral()
         maven { url("https://plugins.gradle.org/m2/") }
         maven { url("https://developer.huawei.com/repo/") }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.4.2"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1"
-        classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.huawei.agconnect:agcp:1.6.0.300'
-
+        classpath libs.bundles.buildscript.plugins
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -31,7 +24,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
-
-
-apply from: 'dependencies.gradle'
+}

dependencies.gradle

@@ -55,7 +55,7 @@ dependencies {
 
 
     //Mindbox
-    implementation 'cloud.mindbox:mobile-sdk:2.11.0'
+    implementation 'cloud.mindbox:mobile-sdk:2.11.1'
     implementation 'cloud.mindbox:mindbox-firebase'
     implementation 'cloud.mindbox:mindbox-huawei'
 

example/app/build.gradle

@@ -20,4 +20,4 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # SDK version property
-SDK_VERSION_NAME=2.11.0
+SDK_VERSION_NAME=2.11.1

gradle.properties

@@ -0,0 +1,106 @@
+[versions]
+compile_sdk = "34"
+build_tools = "34.0.0"
+min_sdk = "19"
+target_sdk = "34"
+
+firebase_bom = "32.7.2"
+hms_push = "6.11.0.300"
+room = "2.5.1"
+kotlin = "1.8.21"
+gradle_plugin = "7.4.2"
+gms_play_services_basement = "18.0.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"
+kotlinx_coroutines_core = "1.4.2"
+kotlinx_coroutines_android = "1.5.0"
+volley = "1.2.1"
+gson = "2.8.9"
+work_manager = "2.7.1"
+androidx_lifecycle = "2.3.1"
+androidx_core_ktx = "1.7.0"
+androidx_annotations = "1.3.0"
+constraint_layout = "2.1.4"
+threetenapb = "1.4.6"
+glide = "4.15.1"
+
+junit = "4.13.2"
+androidx_junit = "1.1.3"
+espresso = "3.4.0"
+mockk = "1.13.3"
+robolectric = "4.11"
+test_core = "1.5.0"
+turbine = "0.12.1"
+kotlinx_coroutines_test = "1.4.2"
+
+agcp = "1.6.0.300"
+maven_plugin = "2.1"
+
+[bundles]
+buildscript-plugins = [
+    "android_tools_build_gradle",
+    "kotlin_gradle_plugin",
+    "google_services",
+    "maven_plugin",
+    "agcp"
+]
+
+test = [
+    "junit",
+    "mockk",
+    "robolectric",
+    "test_core",
+    "turbine",
+    "kotlinx_coroutines_test"
+]
+
+androidTest = [
+    "androidx_junit",
+    "espresso"
+]
+
+[libraries]
+kotlin_stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
+androidx_core_ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx_core_ktx" }
+androidx_annotations = { group = "androidx.annotation", name = "annotation", version.ref = "androidx_annotations" }
+firebase_bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebase_bom" }
+firebase_messaging = { group = "com.google.firebase", name = "firebase-messaging" }
+gms_play_services_basement = { group = "com.google.android.gms", name = "play-services-basement", version.ref = "gms_play_services_basement" }
+gms_play_services_base = { group = "com.google.android.gms", name = "play-services-base", version.ref = "gms_play_services_base" }
+gms_play_services_ads_identifier = { group = "com.google.android.gms", name = "play-services-ads-identifier", version.ref = "gms_play_services_ads_identifier" }
+kotlinx_coroutines_core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx_coroutines_core" }
+kotlinx_coroutines_android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx_coroutines_android" }
+volley = { group = "com.android.volley", name = "volley", version.ref = "volley" }
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
+room_runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
+room_ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
+room_compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
+work_manager = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "work_manager" }
+androidx_lifecycle = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidx_lifecycle" }
+hms_push = { group = "com.huawei.hms", name = "push", version.ref = "hms_push" }
+hms_ads_identifier = { group = "com.huawei.hms", name = "ads-identifier", version.ref = "hms_ads_identifier" }
+constraint_layout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraint_layout" }
+threetenabp = { group = "com.jakewharton.threetenabp", name = "threetenabp", version.ref = "threetenapb" }
+glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" }
+glide_compiler = { group = "com.github.bumptech.glide", name = "compiler", version.ref = "glide" }
+
+# Test libraries
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx_junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx_junit" }
+espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
+mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
+mockk_android = { group = "io.mockk", name = "mockk-android", version.ref = "mockk" }
+mockk_agent = { group = "io.mockk", name = "mockk-agent", version.ref = "mockk" }
+robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
+test_core = { group = "androidx.test", name = "core", version.ref = "test_core" }
+turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine" }
+kotlinx_coroutines_test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx_coroutines_test" }
+
+# Buildscript plugins
+android_tools_build_gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle_plugin" }
+kotlin_gradle_plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+google_services = { module = "com.google.gms:google-services", version.ref = "google_services" }
+maven_plugin = { module = "com.github.dcendents:android-maven-gradle-plugin", version.ref = "maven_plugin" }
+agcp = { module = "com.huawei.agconnect:agcp", version.ref = "agcp" }

gradle/libs.versions.toml

@@ -12,23 +12,23 @@ android {
 dependencies {
     implementation project(path: ':sdk')
 
-    implementation sdkDependencies.androidx_core_ktx
-    implementation sdkDependencies.kotlinx_coroutines_core
+    // Implementation dependencies
+    implementation libs.androidx.core.ktx
+    implementation libs.kotlinx.coroutines.core
 
-    implementation sdkDependencies.gson
+    // GSON
+    implementation libs.gson
 
     // Firebase messaging
-    implementation platform(sdkDependencies.firebase_bom)
-    implementation sdkDependencies.firebase_messaging
-    implementation sdkDependencies.gms_play_services_base
-    implementation sdkDependencies.gms_play_services_basement
+    implementation platform(libs.firebase.bom)
+    implementation libs.firebase.messaging
+    implementation libs.gms.play.services.base
+    implementation libs.gms.play.services.basement
 
     // Ads
-    implementation sdkDependencies.gms_play_services_ads_identifier
-    testImplementation testDependencies.junit
-    testImplementation testDependencies.mockk
-    testImplementation testDependencies.mockk_android
-    testImplementation testDependencies.mockk_agent
-    testImplementation testDependencies.test_core
+    implementation libs.gms.play.services.ads.identifier
+
+    // Test dependencies
+    testImplementation libs.bundles.test
 
 }

mindbox-firebase/build.gradle

@@ -12,14 +12,18 @@ android {
 dependencies {
     implementation project(path: ':sdk')
 
-    implementation sdkDependencies.kotlinx_coroutines_core
-    implementation sdkDependencies.hms_push
-    implementation sdkDependencies.hms_ads_identifier
-    implementation sdkDependencies.gson
-    implementation sdkDependencies.androidx_annotations
-    testImplementation testDependencies.junit
-    testImplementation testDependencies.mockk
-    testImplementation testDependencies.mockk_android
-    testImplementation testDependencies.mockk_agent
-    testImplementation testDependencies.test_core
+    // Implementation dependencies
+    implementation libs.kotlinx.coroutines.core
+
+    // HMS
+    implementation libs.hms.push
+    implementation libs.hms.ads.identifier
+
+    // GSON
+    implementation libs.gson
+    implementation libs.androidx.annotations
+
+    // Test dependencies
+    testImplementation libs.bundles.test
+
 }

mindbox-huawei/build.gradle

@@ -1,19 +1,18 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'org.jetbrains.dokka'
 apply plugin: 'signing'
 apply plugin: 'maven-publish'
 
 group = 'com.github.mindbox-cloud'
 
 android {
-    compileSdkVersion 34
-    buildToolsVersion "34.0.0"
+    compileSdkVersion libs.versions.compile.sdk.get().toInteger()
+    buildToolsVersion libs.versions.build.tools.get()
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 34
+        minSdkVersion libs.versions.min.sdk.get().toInteger()
+        targetSdkVersion libs.versions.target.sdk.get().toInteger()
         versionCode 1
         multiDexEnabled true
         versionName '"' + SDK_VERSION_NAME + '"'
@@ -44,11 +43,6 @@ android {
         jvmTarget = '1.8'
     }
 
-    dokka {
-        outputFormat = 'javadoc'
-        outputDirectory = "$buildDir/dokka"
-    }
-
     task androidSourcesJar(type: Jar) {
         archiveClassifier.set('sources')
         from android.sourceSets.main.java.srcDirs