Merge pull request #627 from mindbox-cloud/release/2.14.0

Release 2.14.0

Author: AndreyEmtsov

.github/workflows/distribute-release-support.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
       - name: lint check
-        run: ./gradlew --no-daemon check
+        run: ./gradlew --no-daemon lintDebug
 
   unit-tests:
     runs-on: ubuntu-latest
@@ -96,14 +96,15 @@ jobs:
           echo '${{secrets.GPGKEYCONTENTS}}' | base64 -d > /tmp/publish_key.gpg
           gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRETPASSPHRASE}}" \
           --output /tmp/secret.gpg /tmp/publish_key.gpg
-          echo "signing.password=${{secrets.signingpassword}}" >> gradle.properties
-          echo "signing.keyId=${{secrets.signingkeyId}}" >> gradle.properties
+          echo "" >> gradle.properties
+          echo "signing.password=${{secrets.SIGNINGPASSWORD}}" >> gradle.properties
+          echo "signing.keyId=${{secrets.SIGNINGKEYID}}" >> gradle.properties
           echo "signing.secretKeyRingFile=/tmp/secret.gpg" >> gradle.properties
           echo "mavenCentralUsername=${{secrets.CENTER_PORTAL_USERNAME}}" >> gradle.properties
           echo "mavenCentralPassword=${{secrets.CENTER_PORTAL_PASSWORD}}" >> gradle.properties
         env:
-          signingpassword: ${{secrets.signingpassword}}
-          signingkeyId: ${{secrets.signingkeyId}}
+          signingpassword: ${{secrets.SIGNINGPASSWORD}}
+          signingkeyId: ${{secrets.SIGNINGKEYID}}
           SECRETPASSPHRASE: ${{secrets.SECRETPASSPHRASE}}
           GPGKEYCONTENTS: ${{secrets.GPGKEYCONTENTS}}
           SONATYPE_CONNECT_TIMEOUT_SECONDS: 60

.github/workflows/publish-reusable.yml

@@ -2,8 +2,8 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven { url("https://plugins.gradle.org/m2/") }
-        maven { url("https://developer.huawei.com/repo/") }
+        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url "https://developer.huawei.com/repo/" }
         maven { url "https://artifactory-external.vkpartner.ru/artifactory/maven" }
     }
     dependencies {
@@ -15,8 +15,9 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        maven { url 'https://developer.huawei.com/repo/' }
+        maven { url "https://developer.huawei.com/repo/" }
         maven { url "https://artifactory-external.vkpartner.ru/artifactory/maven" }
+        maven { url "https://central.sonatype.com/repository/maven-snapshots/" }
         mavenLocal()
     }
 }

build.gradle

@@ -15,4 +15,17 @@
 .cxx
 local.properties
 /app/agconnect-services.json
-/app/google-services.json
+/app/google-services.json
+*.apk
+*.aab
+*.ap_
+*.a_
+*.apks
+*.dex
+*.class
+*.jar
+*.so
+*.zip
+*.keystore
+keystore.properties
+*.jks

example/.gitignore

@@ -5,16 +5,22 @@ plugins {
     id 'com.huawei.agconnect'
 }
 
+def keystorePropertiesFile = rootProject.file("keystore.properties")
+def keystoreProperties = new Properties()
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     namespace 'com.mindbox.example'
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.mindbox.example"
         minSdk 21
-        targetSdk 34
-        versionCode 1
-        versionName "1.0"
+        targetSdk 35
+        versionCode 7
+        versionName "2.5"
         multiDexEnabled true
     }
 
@@ -31,9 +37,27 @@ android {
     buildFeatures {
         buildConfig = true
     }
+    signingConfigs {
+        debug {
+            storeFile file('debug.keystore')
+            storePassword 'android'
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
+        }
+
+        release {
+            if (keystorePropertiesFile.exists()) {
+                storeFile file(keystoreProperties['storeFile'])
+                storePassword keystoreProperties['storePassword']
+                keyAlias keystoreProperties['keyAlias']
+                keyPassword keystoreProperties['keyPassword']
+            }
+        }
+    }
+
     buildTypes {
         release {
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -42,14 +66,7 @@ android {
             signingConfig signingConfigs.debug
         }
     }
-    signingConfigs {
-        debug {
-            storeFile file('debug.keystore')
-            storePassword 'android'
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-        }
-    }
+
 }
 // If the version of firebase-bom used in the sdk is higher, then it will be applied
 // To change the dependency resolution strategy use the code below
@@ -75,7 +92,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.11.0'
 
     //Mindbox
-    implementation 'cloud.mindbox:mobile-sdk:2.13.5'
+    implementation 'cloud.mindbox:mobile-sdk:2.14.0'
     implementation 'cloud.mindbox:mindbox-firebase'
     implementation 'cloud.mindbox:mindbox-huawei'
     implementation 'cloud.mindbox:mindbox-rustore'

example/app/build.gradle

@@ -18,4 +18,19 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontwarn android.telephony.HwTelephonyManager
+-dontwarn com.huawei.android.os.BuildEx$VERSION
+-dontwarn com.huawei.android.telephony.ServiceStateEx
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsConfig$Builder
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsConfig
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsInstance$Builder
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsInstance
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsManager
+-dontwarn com.huawei.hianalytics.util.HiAnalyticTools
+-dontwarn com.huawei.libcore.io.ExternalStorageFile
+-dontwarn com.huawei.libcore.io.ExternalStorageFileInputStream
+-dontwarn com.huawei.libcore.io.ExternalStorageFileOutputStream
+-dontwarn com.huawei.libcore.io.ExternalStorageRandomAccessFile
+
+-keep class com.mindbox.example.PushPayload { *; }

example/app/proguard-rules.pro

@@ -14,6 +14,7 @@
         android:name=".ExampleApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/Theme.MindboxAndroidSdkExample">

example/app/src/main/AndroidManifest.xml

@@ -45,6 +45,7 @@ class MainActivity : AppCompatActivity() {
         binding.btnSyncOperation.setOnClickListener {
             //https://developers.mindbox.ru/docs/android-integration-of-actions
             sendSync(type = SyncOperationType.OPERATION_BODY_WITH_CUSTOM_RESPONSE, context = this)
+            showToast(context = this, message = "Sync operation was sent")
         }
         binding.btnOpenActivity.setOnClickListener {
             val intent = Intent(this, ActivityTransitionByPush::class.java)

example/app/src/main/java/com/mindbox/example/MainActivity.kt

@@ -65,4 +65,4 @@ class NotificationAdapter(private val onItemClick:(MindboxRemoteMessage) -> Unit
         }
     }
 
-}
+}

example/app/src/main/java/com/mindbox/example/NotificationAdapter.kt

@@ -107,8 +107,8 @@ private fun getProductRecoSyncWithCustomClassOnResponse(context: Context) {
             )
         ),
         classOfV = OperationResponse::class.java,
-        onSuccess = { response -> handleSuccess(context, response, null) },
-        onError = { error -> handleError(context, error) }
+        onSuccess = { },
+        onError = { }
     )
 }