Merge pull request #486 from gradle/wrapperbot/android-cache-fix-grad…

…le-plugin/gradle-wrapper-8.1

Bump Gradle Wrapper from 8.0.2 to 8.1

README.md

@@ -18,7 +18,7 @@
 Some Android plugin versions have issues with Gradle's build cache feature. When applied to an Android project this plugin applies workarounds for these issues based on the Android plugin and Gradle versions. For other versions, please see [older versions.](#older-android-gradle-plugin-versions)
 
 * Supported Gradle versions: 7.0+
-* Supported Android Gradle Plugin versions: 7.0.4, 7.1.3, 7.2.2, 7.3.1, 7.4.2, 8.0.0-beta05, and 8.1.0-alpha09
+* Supported Android Gradle Plugin versions: 7.0.4, 7.1.3, 7.2.2, 7.3.1, 7.4.2, 8.0.0, and 8.1.0-alpha11
 * Supported Kotlin versions: 1.6.0+
 
 We only test against the latest patch versions of each minor version of Android Gradle Plugin.  This means that although it may work perfectly well with an older patch version (say 7.0.1), we do not test against these older patch versions, so the latest patch version is the only version from that minor release that we technically support.

build.gradle

@@ -126,7 +126,7 @@ supportedVersions.keySet().each { androidVersion ->
         systemProperty 'org.gradle.android.java_zulu_path', project.providers.environmentVariable('ZULU_JDK').getOrNull()
         systemProperty 'org.gradle.android.java_zulu_alt_path', project.providers.environmentVariable('ZULU_ALT_JDK').getOrNull()
 
-        if (androidVersion >= "8.0.0-alpha10") {
+        if (androidVersion >= "8.0.0") {
             javaLauncher = javaToolchains.launcherFor {
                 languageVersion = JavaLanguageVersion.of(17)
             }
@@ -189,7 +189,7 @@ tasks.named("githubRelease").configure {
     dependsOn(createReleaseTag)
 }
 
-tasks.withType(Sign).configureEach {
+tasks.withType(com.gradle.publish.PublishTask).configureEach {
     notCompatibleWithConfigurationCache("$name task does not support configuration caching")
 }
 

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.vfs.watch=true
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.unsafe.configuration-cache=true
+org.gradle.configuration-cache=true
 org.gradle.jvmargs=-Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8
 
 isPTSEnabled=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionSha256Sum=a62c5f99585dd9e1f95dab7b9415a0e698fa9dd1e6c38537faa81ac078f4d23e
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# 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"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,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

release/changes.md

@@ -1,2 +1,2 @@
-- [NEW] - Run tests against AGP 8.0.0-beta05
-- [NEW] - Run tests against AGP 8.1.0-alpha09
+- [NEW] - Run tests against AGP 8.0.0
+- [NEW] - Run tests against AGP 8.1.0-alpha11

src/main/resources/versions.json

@@ -1,9 +1,9 @@
 {
     "supportedVersions": {
-        "8.1.0-alpha09": [
+        "8.1.0-alpha11": [
             "8.0.2"
         ],
-        "8.0.0-beta05": [
+        "8.0.0": [
             "8.0.2"
         ],
         "7.4.2": [

src/test/groovy/org/gradle/android/WorkaroundTest.groovy

@@ -12,8 +12,8 @@ class WorkaroundTest extends Specification {
         workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
         where:
         androidVersion  | expectedWorkarounds
-        "8.1.0-alpha09" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
-        "8.0.0-beta05"  | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
+        "8.1.0-alpha11" | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
+        "8.0.0"  | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
         "7.4.2"         | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
         "7.3.1"         | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']
         "7.2.2"         | ['MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask', 'JdkImage']

src/test/resources/expectedOutcomes/8.1.0-alpha09_outcomes.json → src/test/resources/expectedOutcomes/8.1.0-alpha11_outcomes.json

@@ -80,12 +80,12 @@
     ":app:preBuild"                                      :  "UP_TO_DATE",
     ":app:preDebugBuild"                                 :  "UP_TO_DATE",
     ":app:preReleaseBuild"                               :  "UP_TO_DATE",
-    ":app:processDebugJavaRes"                           :  "NO_SOURCE",
+    ":app:processDebugJavaRes"                           :  "SUCCESS",
     ":app:processDebugMainManifest"                      :  "FROM_CACHE",
     ":app:processDebugManifest"                          :  "FROM_CACHE",
     ":app:processDebugManifestForPackage"                :  "FROM_CACHE",
     ":app:processDebugResources"                         :  "FROM_CACHE",
-    ":app:processReleaseJavaRes"                         :  "NO_SOURCE",
+    ":app:processReleaseJavaRes"                         :  "SUCCESS",
     ":app:processReleaseMainManifest"                    :  "FROM_CACHE",
     ":app:processReleaseManifest"                        :  "FROM_CACHE",
     ":app:processReleaseManifestForPackage"              :  "FROM_CACHE",
@@ -104,8 +104,6 @@
     ":library:bundleDebugAar"                            :  "SUCCESS",
     ":library:bundleLibCompileToJarDebug"                :  "SUCCESS",
     ":library:bundleLibCompileToJarRelease"              :  "SUCCESS",
-    ":library:bundleLibResDebug"                         :  "SUCCESS",
-    ":library:bundleLibResRelease"                       :  "SUCCESS",
     ":library:bundleLibRuntimeToDirDebug"                :  "SUCCESS",
     ":library:bundleLibRuntimeToDirRelease"              :  "SUCCESS",
     ":library:bundleLibRuntimeToJarDebug"                :  "SUCCESS",
@@ -178,9 +176,9 @@
     ":library:prepareLintJarForPublish"                  :  "SUCCESS",
     ":library:prepareReleaseArtProfile"                  :  "SUCCESS",
     ":library:preReleaseBuild"                           :  "UP_TO_DATE",
-    ":library:processDebugJavaRes"                       :  "NO_SOURCE",
+    ":library:processDebugJavaRes"                       :  "SUCCESS",
     ":library:processDebugManifest"                      :  "FROM_CACHE",
-    ":library:processReleaseJavaRes"                     :  "NO_SOURCE",
+    ":library:processReleaseJavaRes"                     :  "SUCCESS",
     ":library:processReleaseManifest"                    :  "FROM_CACHE",
     ":library:stripDebugDebugSymbols"                    :  "NO_SOURCE",
     ":library:stripReleaseDebugSymbols"                  :  "NO_SOURCE",