Upgrade Kotlin to 2.2.0 and fix gradle

.github/workflows/default.yml

@@ -49,7 +49,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest ]
-        gradle: [ 8.4, current, release-candidate ]
+        gradle: [ 8.4, current ] # excluding release-candidate since 9.x drops support for Java < 17
         java: [ 11, 17, 21 ]
 
     name: '[${{ matrix.os }}] Gradle: ${{ matrix.gradle }}, Java: ${{ matrix.java }}'
@@ -83,32 +83,14 @@ jobs:
           name: "test-project-reports-${{ matrix.os }}-${{ matrix.gradle }}-${{ matrix.java }}"
           path: "${{ github.workspace }}/**/build/reports/ktlint"
 
-  provide-agp-version-matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      agp-versions: ${{ steps.build-agp-matrix.outputs.agp-versions }}
-    steps:
-      - id: agp-version-finder
-        uses: usefulness/agp-version-finder-action@v1
-
-      - id: build-agp-matrix
-        run: |
-           if [[ ${{ github.event_name }} == 'pull_request' ]]; then
-             echo 'agp-versions=["${{ steps.agp-version-finder.outputs.latest-stable }}"]' >> $GITHUB_OUTPUT
-           else
-             echo 'agp-versions=["${{ steps.agp-version-finder.outputs.latest-stable }}", "${{ steps.agp-version-finder.outputs.latest-alpha }}"]' >> $GITHUB_OUTPUT
-           fi
-
   integration-tests-android:
     runs-on: ubuntu-latest
-    needs:
-      - provide-agp-version-matrix
     strategy:
       fail-fast: false
       matrix:
         gradle: [ current ]
         java: [ 21 ]
-        agp: ${{ fromJSON(needs.provide-agp-version-matrix.outputs.agp-versions) }}
+        agp: [7.4.2, 8.5.2, 8.11.1]
 
     name: '[android] Gradle: ${{ matrix.gradle }}, Java: ${{ matrix.java }}, AGP: ${{ matrix.agp }}'
     steps:

build.gradle.kts

@@ -88,13 +88,13 @@ tasks {
     }
 
     withType<JavaCompile>().configureEach {
-        options.release.set(JavaVersion.VERSION_1_8.majorVersion.toInt())
+        options.release.set(JavaVersion.VERSION_11.majorVersion.toInt())
     }
     withType<KotlinJvmCompile>().configureEach {
         compilerOptions {
-            apiVersion.set(KotlinVersion.KOTLIN_1_8)
-            languageVersion.set(KotlinVersion.KOTLIN_1_8)
-            jvmTarget.set(JvmTarget.JVM_1_8)
+            apiVersion.set(KotlinVersion.KOTLIN_2_0)
+            languageVersion.set(KotlinVersion.KOTLIN_2_0)
+            jvmTarget.set(JvmTarget.JVM_11)
         }
     }
     withType<Test>().configureEach {
@@ -107,7 +107,7 @@ tasks {
     }
 
     wrapper {
-        gradleVersion = "8.11.1"
+        gradleVersion = "8.14.3"
     }
 }
 

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-kotlin = "2.1.21"
+kotlin = "2.2.0"
 ktlint = "1.6.0"
-android-tools = "7.3.1"
-junit = "5.13.1"
+android-tools = "7.4.2"
+junit = "5.13.3"
 mockito = "4.1.0"
 commons-io = "2.19.0"
 gradle-publish = "1.3.1"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum