Gradle 8.1.1 & adjustment of now-removed deprecated Report API

Author: mannodermaus

plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/extensions/ConfigurableReportExt.kt

@@ -2,14 +2,6 @@ package de.mannodermaus.gradle.plugins.junit5.internal.extensions
 
 import org.gradle.api.file.FileSystemLocationProperty
 import org.gradle.api.reporting.ConfigurableReport
-import java.io.File
 
-// Account for deprecated destination property
-// and prefer outputLocation, if possible
-@Suppress("DEPRECATION")
-internal fun ConfigurableReport.setDestinationCompat(file: File) {
-    when (val location = this.outputLocation) {
-        is FileSystemLocationProperty<*> -> location.set(file)
-        else -> this.destination = file
-    }
-}
+internal val ConfigurableReport.outputLocationFile
+    get() = outputLocation as? FileSystemLocationProperty<*>

plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/tasks/AndroidJUnit5JacocoReport.kt

@@ -8,13 +8,15 @@ import de.mannodermaus.gradle.plugins.junit5.internal.extensions.getTaskName
 import de.mannodermaus.gradle.plugins.junit5.internal.extensions.junit5Info
 import de.mannodermaus.gradle.plugins.junit5.internal.extensions.junitPlatform
 import de.mannodermaus.gradle.plugins.junit5.internal.extensions.namedOrNull
-import de.mannodermaus.gradle.plugins.junit5.internal.extensions.setDestinationCompat
+import de.mannodermaus.gradle.plugins.junit5.internal.extensions.outputLocationFile
 import de.mannodermaus.gradle.plugins.junit5.internal.providers.DirectoryProvider
 import de.mannodermaus.gradle.plugins.junit5.internal.providers.mainClassDirectories
 import de.mannodermaus.gradle.plugins.junit5.internal.providers.mainSourceDirectories
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.file.FileCollection
+import org.gradle.api.file.FileSystemLocationProperty
+import org.gradle.api.reporting.ConfigurableReport
 import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.testing.Test
@@ -96,7 +98,7 @@ public abstract class AndroidJUnit5JacocoReport : JacocoReport() {
 
             allReports.forEach { (from, to) ->
                 to.required.set(from.enabled)
-                from.destination?.let(to::setDestinationCompat)
+                from.destination?.let { to.outputLocationFile?.set(it) }
             }
 
             // Task-level Configuration

plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/plugin/AgpJacocoBaseTests.kt

@@ -2,10 +2,12 @@ package de.mannodermaus.gradle.plugins.junit5.plugin
 
 import com.google.common.truth.Truth.assertThat
 import de.mannodermaus.gradle.plugins.junit5.internal.extensions.junitPlatform
+import de.mannodermaus.gradle.plugins.junit5.internal.extensions.outputLocationFile
 import de.mannodermaus.gradle.plugins.junit5.tasks.AndroidJUnit5JacocoReport
 import de.mannodermaus.gradle.plugins.junit5.tasks.JACOCO_TASK_NAME
 import de.mannodermaus.gradle.plugins.junit5.util.assertAll
 import de.mannodermaus.gradle.plugins.junit5.util.evaluate
+import org.gradle.api.reporting.ConfigurableReport
 import org.gradle.testing.jacoco.tasks.JacocoReport
 import org.junit.jupiter.api.DynamicTest
 import org.junit.jupiter.api.DynamicTest.dynamicTest
@@ -64,41 +66,46 @@ interface AgpJacocoBaseTests : AgpVariantAwareTests {
         val project = createProject().applyJacocoPlugin().build()
         project.junitPlatform.jacocoOptions {
             it.xml.destination(project.file("build/other-jacoco-folder/xml"))
-            it.csv.destination(project.file("build/html-reports/jacoco"))
-            it.html.destination(project.file("build/CSVISDABEST"))
+            it.csv.destination(project.file("build/CSVISDABEST"))
+            it.html.destination(project.file("build/html-reports/jacoco"))
         }
         project.evaluate()
 
         project.tasks.withType(AndroidJUnit5JacocoReport::class.java)
                 .map { it.reports }
                 .forEach { report ->
                     assertAll(
-                            { assertThat(report.xml.destination.endsWith("build/other-jacoco-folder/xml")) },
-                            { assertThat(report.csv.destination.endsWith("build/html-reports/jacoco")) },
-                            { assertThat(report.html.destination.endsWith("build/CSVISDABEST")) }
+                            { assertThat(report.xml.outputLocationFilePath).endsWith("build/other-jacoco-folder/xml") },
+                            { assertThat(report.csv.outputLocationFilePath).endsWith("build/CSVISDABEST") },
+                            { assertThat(report.html.outputLocationFilePath).endsWith("build/html-reports/jacoco") },
                     )
                 }
     }
 
     @ValueSource(booleans = [true, false])
     @ParameterizedTest(name = "acknowledge status of report tasks when enabled={0}")
-    fun `acknowledge status of report tasks`(enabled: Boolean) {
+    fun `acknowledge status of report tasks`(required: Boolean) {
         val project = createProject().applyJacocoPlugin().build()
         project.junitPlatform.jacocoOptions {
-            it.xml.enabled(enabled)
-            it.csv.enabled(enabled)
-            it.html.enabled(enabled)
+            it.xml.enabled(required)
+            it.csv.enabled(required)
+            it.html.enabled(required)
         }
         project.evaluate()
 
         project.tasks.withType(AndroidJUnit5JacocoReport::class.java)
                 .map { it.reports }
                 .forEach {
                     assertAll(
-                            { assertThat(it.xml.isEnabled == enabled) },
-                            { assertThat(it.csv.isEnabled == enabled) },
-                            { assertThat(it.html.isEnabled == enabled) }
+                            { assertThat(it.xml.required.get() == required) },
+                            { assertThat(it.csv.required.get() == required) },
+                            { assertThat(it.html.required.get() == required) }
                     )
                 }
     }
+
+    /* Private */
+
+    private val ConfigurableReport.outputLocationFilePath get() =
+        outputLocationFile?.asFile?.get()?.absolutePath
 }

plugin/gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

plugin/gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# 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"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 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
         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
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 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

plugin/gradlew

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%