Bump version kotlin, gradle, android sdk (#350)

enotniy · sergeysozinov · web-flow · commit e06a534c280c · 2023-05-24T18:02:07.000+03:00
Co-authored-by: Sergey Sozinov &lt;103035673+sergeysozinov@users.noreply.github.com&gt;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,38 +14,36 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
 
       - name: lint check
-        uses: eskatos/gradle-command-action@v1
-        with:
-          gradle-version: 6.8
-          arguments: lintDebug
+        run: ./gradlew --no-daemon lintDebug
 
   unit:
     runs-on: ubuntu-latest 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
 
       - name: unit tests
-        uses: eskatos/gradle-command-action@v1
-        with:
-          gradle-version: 6.8
-          arguments: testDebugUnitTest --stacktrace
+        run: ./gradlew --no-daemon --stacktrace testDebugUnitTest
 
       - name: test report
         uses: asadmansr/android-test-report-action@v1.2.0
@@ -56,13 +54,12 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
 
       - name: build project
-        uses: eskatos/gradle-command-action@v1
-        with:
-          gradle-version: 6.8
-          arguments: assembleDebug
+        run: ./gradlew --no-daemon assembleDebug
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,65 +15,64 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
 
       - name: lint check
-        uses: eskatos/gradle-command-action@v1
-        with:
-          gradle-version: 6.8
-          arguments: check
+        run: ./gradlew --no-daemon check
 
   unit:
     runs-on: ubuntu-latest 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
 
       - name: unit tests
-        uses: eskatos/gradle-command-action@v1
-        with:
-          gradle-version: 6.8
-          arguments: test testDebugUnitTest
+        run: ./gradlew --no-daemon testDebugLocalUnitTest
 
   build:
     needs: [unit, lint]
     runs-on: ubuntu-latest 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
 
       - name: build project
-        uses: eskatos/gradle-command-action@v1
-        with:
-          gradle-version: 6.8
-          arguments: build assembleDebug
+        run: ./gradlew --no-daemon assembleDebug
 
   publish:
     needs: [build]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
 
       - name: Prepare to publish
         run: |
@@ -95,10 +94,7 @@ jobs:
         run: ./git-release.sh "${{secrets.GITHUBACCESSTOKEN}}" "${{secrets.GITHUBUSER}}"
 
       - name: Publish to Sonatype
-        uses: eskatos/gradle-command-action@v1
-        with:
-          gradle-version: 6.8
-          arguments: test publish -PsonatypeUsername=${{secrets.OSSRHUSERNAME}} -PsonatypePassword=${{secrets.OSSRHPASSWORD}}
+        run: ./gradlew --no-daemon publish -PsonatypeUsername=${{secrets.OSSRHUSERNAME}} -PsonatypePassword=${{secrets.OSSRHPASSWORD}}
 
       - name: Job status notification
         uses: rtCamp/action-slack-notify@v2
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.6.21"
+    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:4.2.2"
+        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'
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -13,9 +13,9 @@ ext {
         kotlinx_coroutines_android: 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0',
         volley: 'com.android.volley:volley:1.2.1',
         gson: 'com.google.code.gson:gson:2.8.7',
-        room: 'androidx.room:room-runtime:2.4.1',
-        room_ktx: 'androidx.room:room-ktx:2.4.1',
-        room_compiler: 'androidx.room:room-compiler:2.4.1',
+        room: 'androidx.room:room-runtime:2.5.1',
+        room_ktx: 'androidx.room:room-ktx:2.5.1',
+        room_compiler: 'androidx.room:room-compiler:2.5.1',
         work_manager: 'androidx.work:work-runtime-ktx:2.7.1',
         androidx_lifecycle: 'androidx.lifecycle:lifecycle-process:2.3.1',
         hms_push: 'com.huawei.hms:push:6.5.0.300',
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/mindbox-firebase/gradle.properties b/mindbox-firebase/gradle.properties
@@ -1,3 +1,4 @@
 ARTIFACT_ID=mindbox-firebase
 ARTIFACT_NAME=Mindbox Firebase Push SDK
-MIN_SDK_VERSION=16
+MIN_SDK_VERSION=16
+android.disableAutomaticComponentCreation=true
diff --git a/mindbox-huawei/gradle.properties b/mindbox-huawei/gradle.properties
@@ -1,3 +1,4 @@
 ARTIFACT_ID=mindbox-huawei
 ARTIFACT_NAME=Mindbox Huawei Push SDK
-MIN_SDK_VERSION=17
+MIN_SDK_VERSION=17
+android.disableAutomaticComponentCreation=true
diff --git a/modulesCommon.gradle b/modulesCommon.gradle
@@ -2,20 +2,18 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'org.jetbrains.dokka'
-apply plugin: 'maven'
 apply plugin: 'signing'
 apply plugin: 'maven-publish'
 
 group = 'com.github.mindbox-moscow'
-apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 33
+    buildToolsVersion "33.0.2"
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         multiDexEnabled true
         versionName '"' + SDK_VERSION_NAME + '"'
@@ -57,61 +55,63 @@ android {
         from android.sourceSets.main.java.srcDirs
     }
 
-    afterEvaluate {
-        publishing {
-            publications {
-                release(MavenPublication) {
-                    from components.release
-                    artifact androidSourcesJar
-                    groupId = 'cloud.mindbox'
-                    artifactId = ARTIFACT_ID
-                    version = SDK_VERSION_NAME
-                    pom {
-                        name = ARTIFACT_NAME
-                        description = 'Test release'
-                        url = 'https://github.com/mindbox-moscow/android-sdk'
-                        licenses {
-                            license {
-                                name = 'The Mindbox License'
-                                url = 'https://github.com/mindbox-moscow/android-sdk/blob/master/LICENSE.md'
-                            }
-                        }
-                        developers {
-                            developer {
-                                id = 'mindbox'
-                                name = 'Petr Nikitin'
-                                email = 'nikitin@mindbox.ru'
-                            }
+}
+
+afterEvaluate {
+    apply plugin: 'maven-publish'
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+                artifact androidSourcesJar
+                groupId = 'cloud.mindbox'
+                artifactId = ARTIFACT_ID
+                version = SDK_VERSION_NAME
+                pom {
+                    name = ARTIFACT_NAME
+                    description = 'Test release'
+                    url = 'https://github.com/mindbox-moscow/android-sdk'
+                    licenses {
+                        license {
+                            name = 'The Mindbox License'
+                            url = 'https://github.com/mindbox-moscow/android-sdk/blob/master/LICENSE.md'
                         }
-                        scm {
-                            connection = 'scm:https://github.com/mindbox-moscow/android-sdk.git'
-                            developerConnection = 'scm:git://github.com/mindbox-moscow/android-sdk.git'
-                            url = 'https://github.com/mindbox-moscow/android-sdk'
+                    }
+                    developers {
+                        developer {
+                            id = 'mindbox'
+                            name = 'Petr Nikitin'
+                            email = 'nikitin@mindbox.ru'
                         }
                     }
+                    scm {
+                        connection = 'scm:https://github.com/mindbox-moscow/android-sdk.git'
+                        developerConnection = 'scm:git://github.com/mindbox-moscow/android-sdk.git'
+                        url = 'https://github.com/mindbox-moscow/android-sdk'
+                    }
                 }
             }
+        }
 
-            repositories {
-                if (!project.hasProperty("sonatypeUsername")) {
-                    ext.sonatypeUsername = "sonatypeUsername"
-                }
-                if (!project.hasProperty("sonatypePassword")) {
-                    ext.sonatypePassword = "sonatypePassword"
-                }
-                maven {
-                    name = "OSSRH"
-                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2")
-                    credentials {
-                        username = sonatypeUsername
-                        password = sonatypePassword
-                    }
+        repositories {
+            if (!project.hasProperty("sonatypeUsername")) {
+                ext.sonatypeUsername = "sonatypeUsername"
+            }
+            if (!project.hasProperty("sonatypePassword")) {
+                ext.sonatypePassword = "sonatypePassword"
+            }
+            maven {
+                name = "OSSRH"
+                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2")
+                credentials {
+                    username = sonatypeUsername
+                    password = sonatypePassword
                 }
             }
         }
+    }
 
-        signing {
-            sign publishing.publications.release
-        }
+    signing {
+        sign publishing.publications.release
     }
 }
diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -14,7 +14,7 @@ android {
     }
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
-            freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+            freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
         }
     }
 
diff --git a/sdk/gradle.properties b/sdk/gradle.properties
@@ -1,2 +1,3 @@
 ARTIFACT_ID=mobile-sdk
-ARTIFACT_NAME=Mindbox Android SDK
+ARTIFACT_NAME=Mindbox Android SDK
+android.disableAutomaticComponentCreation=true
diff --git a/sdk/src/test/java/cloud/mindbox/mobile_sdk/inapp/domain/models/ViewProductNodeTest.kt b/sdk/src/test/java/cloud/mindbox/mobile_sdk/inapp/domain/models/ViewProductNodeTest.kt
@@ -70,8 +70,10 @@ class ViewProductNodeTest {
         MindboxEventManager.eventFlow.resetReplayCache()
         MindboxEventManager.eventFlow.emit(InAppEventType.AppStartup)
         MindboxEventManager.eventFlow.test {
-            assertFalse(InAppStub.viewProductNode.checkTargeting(mockk()))
             awaitItem()
+            assertFalse(InAppStub.viewProductCategoryInNode.checkTargeting(
+                TestTargetingData("viewProduct", null)
+            ))
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ android {`
`14`	`14`	`}`
`15`	`15`	`tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {`
`16`	`16`	`kotlinOptions {`
`17`		`- freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"`
	`17`	`+ freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`