Update: Dependencies

This includes AGP update to version 8.8 and Gradle to 8.10.2

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
       - name: test
         uses: reactivecircus/android-emulator-runner@v2
         with:

.gitignore

@@ -17,3 +17,4 @@ build/
 plugin/src/test/test-fixtures/multi-module/gradle.properties
 plugin/src/test/test-fixtures/multi-module/build.gradle
 plugin/src/test/test-fixtures/multi-module/app/build.gradle
+.kotlin/

gradle.properties

@@ -26,4 +26,6 @@ POM_LICENCE_DIST=repo
 
 POM_DEVELOPER_ID=rolf-smit
 POM_DEVELOPER_NAME=Rolf Smit
-POM_DEVELOPER_URL=https://github.com/rolf-smit
+POM_DEVELOPER_URL=https://github.com/rolf-smit
+
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
 androidMinSdk       = "21"
-androidTargetSdk    = "34"
-androidCompileSdk   = "34"
-kotlin              = "1.9.23"
-androidGradlePlugin = "8.6.0"
+androidTargetSdk    = "35"
+androidCompileSdk   = "35"
+kotlin              = "2.1.10"
+androidGradlePlugin = "8.8.0"
 
 [libraries]
 appCompat              = { module = "androidx.appcompat:appcompat",         version = "1.7.0" }
@@ -17,12 +17,12 @@ truth               = { module = "com.google.truth:truth",
 supportTestRunner   = { module = "androidx.test:runner",                                     version = "1.6.2" }
 espressoCore        = { module = "androidx.test.espresso:espresso-core",                     version = "3.6.1" }
 androidJUnit        = { module = "androidx.test.ext:junit",                                  version = "1.2.1" }
-commonsCsv          = { module = "org.apache.commons:commons-csv",                           version = "1.11.0" }
+commonsCsv          = { module = "org.apache.commons:commons-csv",                           version = "1.13.0" }
 kotlinTest          = { module = "org.jetbrains.kotlin:kotlin-test",                         version.ref = "kotlin" }
-robolectric         = { module = "org.robolectric:robolectric",                              version = "4.13" }
-mockk               = { module = "io.mockk:mockk",                                           version = "1.13.12" }
-jacksonYaml         = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version = "2.17.2"}
-jacksonKotlin       = { module = "com.fasterxml.jackson.module:jackson-module-kotlin",       version = "2.17.2"}
+robolectric         = { module = "org.robolectric:robolectric",                              version = "4.14.1" }
+mockk               = { module = "io.mockk:mockk",                                           version = "1.13.16" }
+jacksonYaml         = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version = "2.18.2"}
+jacksonKotlin       = { module = "com.fasterxml.jackson.module:jackson-module-kotlin",       version = "2.18.2"}
 
 [bundles]
 androidInstrumentedTest = ["supportTestRunner", "espressoCore", "androidJUnit"]
@@ -32,9 +32,9 @@ jvmTest = ["kotlinTest", "junit", "truth", "commonsCsv"]
 [plugins]
 kotlinJvm           = { id = "org.jetbrains.kotlin.jvm",        version.ref = "kotlin" }
 kotlinAndroid       = { id = "org.jetbrains.kotlin.android",    version.ref = "kotlin" }
-kotlinDokka         = { id = "org.jetbrains.dokka",             version = "1.9.20" }
-pluginPortalPublish = { id = "com.gradle.plugin-publish",       version = "1.2.2" }
-mavenPublish        = { id = "com.vanniktech.maven.publish",    version = "0.29.0" }
-versionCheck        = { id = "com.github.ben-manes.versions",   version = "0.51.0" }
+kotlinDokka         = { id = "org.jetbrains.dokka",             version = "2.0.0" }
+pluginPortalPublish = { id = "com.gradle.plugin-publish",       version = "1.3.1" }
+mavenPublish        = { id = "com.vanniktech.maven.publish",    version = "0.30.0" }
+versionCheck        = { id = "com.github.ben-manes.versions",   version = "0.52.0" }
 androidApp          = { id = "com.android.application",         version.ref = "androidGradlePlugin"}
 androidLibrary      = { id = "com.android.library",             version.ref = "androidGradlePlugin"}

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

plugin/build.gradle

@@ -1,4 +1,5 @@
 import com.vanniktech.maven.publish.SonatypeHost
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     // Core Gradle plugins
@@ -25,10 +26,16 @@ version = VERSION_NAME
 group = GROUP
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
     targetCompatibility = JavaVersion.VERSION_17
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+    }
+}
+
 jacocoTestReport {
     reports {
         xml.required = true
@@ -65,8 +72,8 @@ tasks.named('javadoc') {
 }
 tasks.register('javadocJar', Jar) {
     archiveClassifier.set('javadoc')
-    dependsOn tasks.dokkaHtml
-    from tasks.dokkaHtml
+    dependsOn tasks.dokkaGeneratePublicationHtml
+    from tasks.dokkaGeneratePublicationHtml
 }
 test {
     testLogging {

plugin/src/main/kotlin/org/neotech/plugin/rootcoverage/RootCoveragePlugin.kt

@@ -26,7 +26,7 @@ import java.io.File
 
 class RootCoveragePlugin : Plugin<Project> {
 
-    private val minimumRequiredAgpVersion = AndroidPluginVersion(8, 3, 0).alpha(5)
+    private val minimumRequiredAgpVersion = AndroidPluginVersion(8, 8, 0)
 
     private lateinit var rootProjectExtension: RootCoveragePluginExtension
 

plugin/src/test/kotlin/org/neotech/plugin/rootcoverage/IntegrationTest.kt

@@ -232,7 +232,7 @@ class IntegrationTest(
 
             val fixture = File("src/test/test-fixtures/multi-module")
 
-            val gradleVersions = arrayOf("8.7", "8.10")
+            val gradleVersions = arrayOf("8.10.2", "8.11.1", "8.12.1")
 
             val configurations = File(fixture, "configurations").listFiles() ?: error("Configurations folder not found in $fixture")
             return configurations.flatMap { configuration ->

plugin/src/test/test-fixtures/multi-module/app/build.gradle.tmp

@@ -40,8 +40,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 
     testOptions {
@@ -55,7 +55,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "21"
     }
 }
 

plugin/src/test/test-fixtures/multi-module/build.gradle.tmp

@@ -17,7 +17,7 @@ task clean(type: Delete) {
 
 jacoco {
     // https://www.jacoco.org/jacoco/trunk/doc/changes.html
-    toolVersion = "0.8.7"
+    toolVersion = "0.8.12"
 }
 
 rootCoverage {

plugin/src/test/test-fixtures/multi-module/library_android/build.gradle

@@ -33,8 +33,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     testOptions {
@@ -50,7 +50,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "21"
     }
 }
 

plugin/src/test/test-fixtures/multi-module/library_android_flavors/build.gradle

@@ -43,8 +43,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     testOptions {
@@ -60,7 +60,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "21"
     }
 }
 

plugin/src/test/test-fixtures/multi-module/library_java/build.gradle

@@ -6,5 +6,5 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21

plugin/src/test/test-fixtures/multi-module/library_nested/java/build.gradle

@@ -6,5 +6,5 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21