Tech upgrade gradle (#613)

* TECH: Upgrade gradle * TECH: Use docker image with JDK17 * TECH: bump JDK; resolve gradle warnings * TECH: bump JDK in github flows * TECH: replace deprecated JVM flag * TECH: bump compile SDK * TECH: bump kotlin * TECH: bump compose * TECH: resolve warning * TECH: lint * TECH: lint * TECH: fix ADB server configuration
KasperskyLab · Jan 9, 2024 · 05eaf26 · 05eaf26
1 parent 433c769
commit 05eaf26
Show file tree

Hide file tree

Showing 38 changed files with 83 additions and 54 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -6,7 +6,7 @@ check_android_30_task:
   skip: "changesIncludeOnly('NOTICE.txt', 'LICENSE.txt', '**.{md,html}')"
 
   container:
-    image: cirrusci/android-sdk:33
+    image: ghcr.io/cirruslabs/flutter:latest
     kvm: true
     cpu: 8
     memory: 24G
@@ -74,7 +74,7 @@ check_android_33_task:
   skip: "changesIncludeOnly('NOTICE.txt', 'LICENSE.txt', '**.{md,html}')"
 
   container:
-    image: cirrusci/android-sdk:33
+    image: ghcr.io/cirruslabs/flutter:latest
     kvm: true
     cpu: 8
     memory: 24G
@@ -138,7 +138,7 @@ check_android_21_task:
   skip: "changesIncludeOnly('NOTICE.txt', 'LICENSE.txt', '**.{md,html}')"
 
   container:
-    image: cirrusci/android-sdk:33
+    image: ghcr.io/cirruslabs/flutter:latest
     kvm: true
     cpu: 8
     memory: 24G

diff --git a/.github/workflows/publication_maven.yml b/.github/workflows/publication_maven.yml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 17
       - name: Tests
         run: make unit_tests
       - name: Assemble build

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 17
       - name: Run static analysis
         run: make static_analysis
       - name: Run unit tests

diff --git a/.github/workflows/snapshot_check.yml b/.github/workflows/snapshot_check.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 17
       - name: Assemble projects
         run: ./gradlew -Pkaspresso.snapshotVersion=${{ inputs.kaspressoVersion }} assembleDebugAndroidTest
       - name: Check legal documents

diff --git a/adb-server/adbserver-desktop/build.gradle.kts b/adb-server/adbserver-desktop/build.gradle.kts
@@ -25,4 +25,11 @@ tasks.withType<Jar>().configureEach {
     }
     exclude("NOTICE.txt")
     exclude("LICENSE.txt")
+
+    mustRunAfter(
+        ":adb-server:adb-server-desktop-device-connection:jar",
+        ":adb-server:adb-server-command-types:jar",
+        ":adb-server:adb-server-connection:jar",
+        ":adb-server:adb-server-common:jar"
+    )
 }
diff --git a/allure-support/build.gradle.kts b/allure-support/build.gradle.kts
@@ -5,6 +5,10 @@ plugins {
     id("convention.legal-documents")
 }
 
+android {
+    namespace = "com.kaspersky.components.alluresupport"
+}
+
 publish {
     artifactId.set("kaspresso-allure-support")
 }

diff --git a/allure-support/src/main/AndroidManifest.xml b/allure-support/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.kaspersky.components.alluresupport" />
+<manifest />
diff --git a/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts b/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("convention.kotlin-base")
     id("convention.android-base")
+    kotlin("android")
 }
 
 android {
@@ -29,7 +29,7 @@ android {
         viewBinding = true // for the samples
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    kotlin {
+        jvmToolchain(JavaVersion.VERSION_17.majorVersion.toInt())
     }
 }
diff --git a/build-logic/android/src/main/kotlin/convention.android-base.gradle.kts b/build-logic/android/src/main/kotlin/convention.android-base.gradle.kts
@@ -3,11 +3,11 @@ import com.android.build.gradle.BaseExtension
 @Suppress("MagicNumber")
 configure<BaseExtension> {
 
-    compileSdkVersion(33)
+    compileSdkVersion(34)
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     defaultConfig {
@@ -16,9 +16,9 @@ configure<BaseExtension> {
     }
 
     packagingOptions {
-        merges.apply {
-            add("META-INF/LGPL2.1")
-            add("META-INF/AL2.0")
+        resources {
+            merges.add("META-INF/LGPL2.1")
+            merges.add("META-INF/AL2.0")
         }
     }
 

diff --git a/build-logic/android/src/main/kotlin/convention.android-library.gradle.kts b/build-logic/android/src/main/kotlin/convention.android-library.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
     id("com.android.library")
-    id("kotlin-android")
     id("convention.kotlin-base")
     id("convention.android-base")
+    kotlin("android")
 }
 
 androidComponents {

diff --git a/build-logic/kotlin/src/main/kotlin/convention.kotlin-base.gradle.kts b/build-logic/kotlin/src/main/kotlin/convention.kotlin-base.gradle.kts
@@ -1,11 +1,11 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-val kotlinLanguageVersion = "1.7"
+val kotlinLanguageVersion = "1.9"
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
 
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
 
 //        TODO: fix all warnings before
 //        allWarningsAsErrors = true

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -1,5 +1,3 @@
-enableFeaturePreview("VERSION_CATALOGS")
-
 rootProject.name = "build-logic"
 
 include("android")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -33,7 +33,7 @@ val detektAll = tasks.register<Detekt>("detektAll") {
     exclude("**/resources/**")
     exclude("**/build/**")
     reports {
-        xml.enabled = false
-        html.enabled = false
+        xml.required.set(false)
+        html.required.set(false)
     }
 }
diff --git a/compose-support/build.gradle.kts b/compose-support/build.gradle.kts
@@ -5,6 +5,10 @@ plugins {
     id("convention.legal-documents")
 }
 
+android {
+    namespace = "com.kaspersky.components.composesupport"
+}
+
 publish {
     artifactId.set("kaspresso-compose-support")
 }

diff --git a/compose-support/src/main/AndroidManifest.xml b/compose-support/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.kaspersky.components.composesupport" />
+<manifest />
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
 
@@ -7,3 +7,4 @@ kotlin.code.style=official
 android.useAndroidX = true
 
 kaspresso.version=1.5.3
+kaspresso.snapshotVersion=1.5.3-SNAPSHOT
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
-kotlin = "1.7.10"
+kotlin = "1.9.20"
 detekt = "1.21.0"
 espresso = "3.5.1"
 kakao = "3.4.1"
 kakaoCompose = "0.2.3"
 kakaoExtClicks = "1.0.0"
 allure = "2.4.0"
-compose = "1.3.1"
-composeCompiler = "1.3.1"
+compose = "1.5.4"
+composeCompiler = "1.5.4"
 activityCompose = "1.4.0"
 androidXTest = "1.5.0"
 testOrchestrator = "1.4.2"
@@ -17,8 +17,8 @@ thirdPartyReport = "0.18.956"
 [libraries]
 # plugins
 kotlinPlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-androidPlugin = "com.android.tools.build:gradle:7.2.2"
-versionsPlugin = "com.github.ben-manes:gradle-versions-plugin:0.39.0"
+androidPlugin = "com.android.tools.build:gradle:8.1.4"
+versionsPlugin = "com.github.ben-manes:gradle-versions-plugin:0.50.0"
 thirdPartyReportPlugin = { module = "com.kaspersky.gradle:third-party-report", version.ref = "thirdPartyReport" }
 airPlugin = { module = "com.kaspersky.gradle:air", version.ref = "thirdPartyReport" }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kaspresso/build.gradle.kts b/kaspresso/build.gradle.kts
@@ -5,6 +5,10 @@ plugins {
     id("convention.legal-documents")
 }
 
+android {
+    namespace = "com.kaspersky.kaspresso"
+}
+
 publish {
     artifactId.set("kaspresso")
 }

diff --git a/kaspresso/src/main/AndroidManifest.xml b/kaspresso/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.kaspersky.kaspresso">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

diff --git a/kautomator/build.gradle.kts b/kautomator/build.gradle.kts
@@ -5,6 +5,10 @@ plugins {
     id("convention.legal-documents")
 }
 
+android {
+    namespace = "com.kaspersky.components.kautomator"
+}
+
 publish {
     artifactId.set("kautomator")
 }

diff --git a/kautomator/src/main/AndroidManifest.xml b/kautomator/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.kaspersky.components.kautomator" />
+<manifest />
diff --git a/...otlin/com/kaspersky/components/kautomator/component/common/actions/UiScrollableActions.kt b/...otlin/com/kaspersky/components/kautomator/component/common/actions/UiScrollableActions.kt
@@ -33,7 +33,7 @@ interface UiScrollableActions : UiBaseActions {
             } while (scrollable.scrollForward())
             do {
                 if (findObject(to.view.interaction.selector.bySelector) != null)
-                return@perform
+                    return@perform
             } while (scrollable.scrollBackward())
             to.isDisplayed()
         }

diff --git a/samples/adbserver-sample/build.gradle.kts b/samples/adbserver-sample/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    namespace = "com.kaspersky.adbserver.sample"
     defaultConfig {
         applicationId = "com.kaspersky.adbserver.sample"
     }

diff --git a/samples/adbserver-sample/src/main/AndroidManifest.xml b/samples/adbserver-sample/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.kaspersky.adbserver.sample">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

diff --git a/samples/kaspresso-allure-support-sample/build.gradle.kts b/samples/kaspresso-allure-support-sample/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    namespace = "com.kaspersky.kaspresso.alluresupport.sample"
     defaultConfig {
         applicationId = "com.kaspersky.kaspresso.alluresupport.sample"
         testInstrumentationRunner = "com.kaspersky.kaspresso.runner.KaspressoRunner"

diff --git a/samples/kaspresso-allure-support-sample/src/main/AndroidManifest.xml b/samples/kaspresso-allure-support-sample/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.kaspersky.kaspresso.alluresupport.sample">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- This permission is required to get access to /sdcard/allure-results -->
     <uses-permission

diff --git a/samples/kaspresso-compose-support-sample/build.gradle.kts b/samples/kaspresso-compose-support-sample/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    namespace = "com.kaspersky.kaspresso.composesupport.sample"
     defaultConfig {
         minSdk = 21
 

diff --git a/samples/kaspresso-compose-support-sample/src/main/AndroidManifest.xml b/samples/kaspresso-compose-support-sample/src/main/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.kaspersky.kaspresso.composesupport.sample">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:label="@string/app_name"

diff --git a/samples/kaspresso-sample/build.gradle.kts b/samples/kaspresso-sample/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    namespace = "com.kaspersky.kaspressample"
     defaultConfig {
         applicationId = "com.kaspersky.kaspressample"
         testInstrumentationRunner = "com.kaspersky.kaspresso.runner.KaspressoRunner"

diff --git a/samples/kaspresso-sample/src/main/AndroidManifest.xml b/samples/kaspresso-sample/src/main/AndroidManifest.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.kaspersky.kaspressample">
+          xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />

diff --git a/samples/kautomator-sample-app-upgrade/build.gradle.kts b/samples/kautomator-sample-app-upgrade/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    namespace = "com.kaspersky.kaspresso.upgradesample"
     defaultConfig {
         applicationId = "com.kaspersky.kaspresso.sample_upgrade_tests"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/samples/kautomator-sample-app-upgrade/src/main/AndroidManifest.xml b/samples/kautomator-sample-app-upgrade/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.kaspersky.kaspresso.upgradesample">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

diff --git a/samples/kautomator-sample/build.gradle.kts b/samples/kautomator-sample/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    namespace = "com.kaspersky.kaspresso.kautomatorsample"
     defaultConfig {
         applicationId = "com.kaspersky.kaspresso.kautomatorsample"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/samples/kautomator-sample/src/main/AndroidManifest.xml b/samples/kautomator-sample/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.kaspersky.kaspresso.kautomatorsample">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,6 +1,5 @@
 rootProject.name = "kaspresso-framework"
 
-enableFeaturePreview("VERSION_CATALOGS")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 pluginManagement {