Merge pull request #385 from mindbox-cloud/release/2.7.0

Release 2.7.0

Author: sergeysozinov

.github/workflows/deploy.yml

@@ -0,0 +1,24 @@
+name: SDK Distribute
+
+on:
+  pull_request:
+    types: [ closed ]
+    branches:
+      - develop
+  push:
+    branches:
+      - 'release/*'
+
+jobs:
+  update_on_merge:
+    if: github.event.pull_request.merged == true || (github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release/'))
+    runs-on: ubuntu-latest
+    steps:
+      - name: trigger build & send to FAD
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: 61033697
+          repo: mindbox-cloud/android-app
+          ref: develop
+          token: ${{ secrets.GITHUBACCESSTOKEN }}
+

.github/workflows/publish.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'master'
+      - 'support/*'
     paths-ignore:
       - '**.md'
     tags-ignore:

.idea/codeStyles/Project.xml

@@ -24,7 +24,7 @@ ext {
         koin_test: 'io.insert-koin:koin-test:3.2.2',
         koin_junit4: 'io.insert-koin:koin-test-junit4:3.2.2',
         constraint_layout: 'androidx.constraintlayout:constraintlayout:2.1.4',
-        jdk_libs: 'com.android.tools:desugar_jdk_libs:1.2.2'
+        threetenapb: 'com.jakewharton.threetenabp:threetenabp:1.4.6'
     ]
 
     testDependencies = [
@@ -35,7 +35,9 @@ ext {
         turbine: 'app.cash.turbine:turbine:0.12.1',
         mockk: 'io.mockk:mockk:1.13.3',
         mockk_android: 'io.mockk:mockk-android:1.13.3',
-        mockk_agent: 'io.mockk:mockk-agent:1.13.3'
+        mockk_agent: 'io.mockk:mockk-agent:1.13.3',
+        robolectric: 'org.robolectric:robolectric:4.9',
+        test_core: 'androidx.test:core:1.5.0'
     ]
 
 }

dependencies.gradle

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Check if the parameter is provided
+if [ $# -eq 0 ]; then
+  echo "Please provide the release version number as a parameter."
+  exit 1
+fi
+
+# Check if the version number matches the semver format
+if ! [[ $1 =~ ^[0-9]+\.[0-9]+\.[0-9]+(-rc)?$ ]]; then
+  echo "The release version number does not match the semver format (X.Y.Z or X.Y.Z-rc)."
+  exit 1
+fi
+
+# Check the current Git branch
+current_branch=$(git symbolic-ref --short HEAD)
+
+if [[ $current_branch != "develop" && ! $current_branch =~ ^release/[0-9]+\.[0-9]+\.[0-9]+(-rc)?$ ]]; then
+  echo "The current Git branch ($current_branch) is not 'develop' or in the format 'release/X.Y.Z' or 'release/X.Y.Z-rc'."
+  exit 1
+fi
+
+# Create a branch with the version name
+version=$1
+branch_name="release/$version"
+git branch $branch_name
+git checkout $branch_name
+
+# Add changelog to the index and create a commit
+properties_file="gradle.properties"
+current_version=$(grep -E '^SDK_VERSION_NAME=' gradle.properties | cut -d'=' -f2)
+sed -i '' "s/^SDK_VERSION_NAME=.*/SDK_VERSION_NAME=$version/" $properties_file
+
+echo "Bump SDK version from $current_version to $version."
+
+git add $properties_file
+git commit -m "Bump SDK version to $version"
+
+echo "Branch $branch_name has been created."

git-release-branch.sh

@@ -3,7 +3,7 @@ set -e
 version=$(cat gradle.properties | grep SDK_VERSION_NAME | cut -f2 -d"=")
 token=$1
 user=$2
-branch=${GITHUB_REF##*/}
+branch=release/${GITHUB_REF##*/}
 repo_full_name=$(git config --get remote.origin.url | sed 's/.*:\/\/github.com\///;s/.git$//' | cut -f2 -d":")
 generate_post_data() {
   cat <<EOF

git-release.sh

@@ -21,4 +21,4 @@ android.enableJetifier=true
 kotlin.code.style=official
 
 # SDK version property
-SDK_VERSION_NAME=2.7.0-rc
+SDK_VERSION_NAME=2.7.0

gradle.properties

@@ -14,7 +14,6 @@ dependencies {
 
     implementation sdkDependencies.androidx_core_ktx
     implementation sdkDependencies.kotlinx_coroutines_core
-    coreLibraryDesugaring sdkDependencies.jdk_libs
 
     implementation sdkDependencies.gson
 

mindbox-firebase/build.gradle

@@ -17,5 +17,4 @@ dependencies {
     implementation sdkDependencies.hms_ads_identifier
     implementation sdkDependencies.gson
     implementation sdkDependencies.androidx_annotations
-    coreLibraryDesugaring sdkDependencies.jdk_libs
 }

mindbox-huawei/build.gradle

@@ -35,7 +35,6 @@ android {
     }
 
     compileOptions {
-        coreLibraryDesugaringEnabled true
 
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -112,6 +111,14 @@ afterEvaluate {
     }
 
     signing {
-        sign publishing.publications.release
+        def signingKeyId = findProperty("signing.keyId")
+        def signingKey = findProperty("signing.secretKeyRingFile")
+        def signingPassword = findProperty("signing.password")
+        if (signingKeyId && signingKey && signingPassword) {
+            println("Signing applied")
+            sign publishing.publications.release
+        } else {
+            println("Signing not applied")
+        }
     }
 }