Upgrade Gradle to 8.1.1 and AGP to 8.0.1 (#39)

* Upgrade Gradle wrapper to 8.1.1

* Upgrade Android Gradle Plugin to 8.0.1

* Make simple-flank compatible with configuration cache

* use jar as classpath instead of classes for test environment

* add plugin to automatically download missing java toolchains

* use jar task as dependency as explained by docs

* jdk 11 not needed anymore

.github/workflows/pr_checks.yml

@@ -7,11 +7,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'adopt'
       - name: Validate Gradle wrapper
         uses: gradle/[email protected]
       - name: Build with Gradle

.github/workflows/release.yml

@@ -9,11 +9,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'adopt'
       - name: Build with Gradle
         uses: gradle/[email protected]
         env:

build.gradle.kts

@@ -13,29 +13,38 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 val fixtureClasspath: Configuration by configurations.creating
 dependencies {
     implementation(kotlin("stdlib"))
     testImplementation("junit:junit:4.13.2")
     testImplementation("io.strikt:strikt-gradle:0.31.0")
-    compileOnly("com.android.tools.build:gradle:7.1.2")
-    fixtureClasspath("com.android.tools.build:gradle:7.1.2")
+    compileOnly("com.android.tools.build:gradle:8.0.1")
+    fixtureClasspath("com.android.tools.build:gradle:8.0.1")
     fixtureClasspath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20")
 }
 
-// Inspired by: https://github.com/square/sqldelight/blob/83145b28cbdd949e98e87819299638074bd21147/sqldelight-gradle-plugin/build.gradle#L18
-// Append any extra dependencies to the test fixtures via a custom configuration classpath. This
-// allows us to apply additional plugins in a fixture while still leveraging dependency resolution
-// and de-duplication semantics.
 tasks.named("pluginUnderTestMetadata", PluginUnderTestMetadata::class.java) {
-    pluginClasspath.from(fixtureClasspath)
+    pluginClasspath.setFrom(
+        // Inspired by: https://discuss.gradle.org/t/how-to-make-gradle-testkit-depend-on-output-jar-rather-than-just-classes/18940
+        // We need the jar because Gradle by default uses just classes instead of the output jar.
+        // By not using the jar, the test environment is different from the production environment.
+        // In the production environment, resources (keystore and small apk) are inside the jar archive that we need to extract.
+        // In the test environment, resources are just files in the classpath, no need to extract the jar because there isn't one.
+        tasks.jar,
+        // Inspired by: https://github.com/square/sqldelight/blob/83145b28cbdd949e98e87819299638074bd21147/sqldelight-gradle-plugin/build.gradle#L18
+        // Append any extra dependencies to the test fixtures via a custom configuration classpath. This
+        // allows us to apply additional plugins in a fixture while still leveraging dependency resolution
+        // and de-duplication semantics.
+        fixtureClasspath
+    )
+
 }
 
 tasks.withType<Test> {
-    javaLauncher.set(
-        javaToolchains.launcherFor { languageVersion.set(JavaLanguageVersion.of(11)) }
-    )
-
     if (!environment.containsKey("ANDROID_HOME")) {
         environment("ANDROID_HOME", "${environment["HOME"]}/Library/Android/sdk")
     }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -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
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle.kts

@@ -1,2 +1,4 @@
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
+}
 rootProject.name = "simple-flank"
-

src/main/kotlin/io/github/flank/gradle/Device.kt

@@ -14,8 +14,6 @@ constructor(
     @Input @Optional val locale: String? = null,
     @Input @Optional val orientation: Orientation? = null
 ) : Comparable<Device> {
-  private val comparator =
-      compareBy<Device>({ it.id }, { it.osVersion }, { it.locale }, { it.orientation })
 
   override fun toString(): String {
     return "$make $model - $osVersion"
@@ -41,6 +39,11 @@ constructor(
   }
 
   override fun compareTo(other: Device): Int = comparator.compare(this, other)
+
+  companion object {
+    private val comparator =
+        compareBy<Device>({ it.id }, { it.osVersion }, { it.locale }, { it.orientation })
+  }
 }
 
 class NexusLowRes

src/test/resources/app/build.gradle.kts

@@ -24,6 +24,7 @@ android {
     minSdkVersion(21)
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
+  namespace = "flank.simpleflank.testApp"
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8

src/test/resources/library/build.gradle

@@ -18,6 +18,12 @@ android {
     targetSdkVersion = 30
     minSdkVersion = 21
   }
+  namespace = "flank.simpleflank.testLibrary"
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
 }
 
 dependencies {