[Android] Update Kotlin / gradle version in Android Chiptool

.github/workflows/full-android.yaml

@@ -33,13 +33,13 @@ jobs:
         name: Run
 
         env:
-            JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64/
+            JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64/
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-android:104
+            image: ghcr.io/project-chip/chip-build-android:105
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

.github/workflows/smoketest-android.yaml

@@ -31,13 +31,13 @@ jobs:
         name: Smoke Run - Android
 
         env:
-            JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64/
+            JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64/
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-android:98
+            image: ghcr.io/project-chip/chip-build-android:105
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"

examples/android/CHIPTool/build.gradle

@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.8.10'
+    ext.kotlin_version = '2.0.0'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.2.0"
+        classpath "com.android.tools.build:gradle:7.1.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

examples/android/CHIPTool/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

scripts/build/builders/android.py

@@ -164,9 +164,9 @@ def validate_build_environment(self):
             os.environ["ANDROID_HOME"], "tools", "bin", "sdkmanager"
         )
 
-        # New SDK manager at cmdline-tools/latest/bin/
+        # New SDK manager at cmdline-tools/bin/
         new_sdk_manager = os.path.join(
-            os.environ["ANDROID_HOME"], "cmdline-tools", "latest", "bin", "sdkmanager"
+            os.environ["ANDROID_HOME"], "cmdline-tools", "bin", "sdkmanager"
         )
         if not (
             os.path.isfile(sdk_manager) and os.access(sdk_manager, os.X_OK)
@@ -413,7 +413,6 @@ def generate(self):
             new_sdk_manager = os.path.join(
                 os.environ["ANDROID_HOME"],
                 "cmdline-tools",
-                "latest",
                 "bin",
                 "sdkmanager",
             )