Upgradle to 8.7-rc-1
For change in StudioTask, filed https://github.com/gradle/gradle/issues/28216
so we could move to a public API
Test: ./gradlew bOS --dry-run
Change-Id: I7504123b2232dd32501775ade7d02801dfc1d91a
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/studio/StudioTask.kt b/buildSrc/private/src/main/kotlin/androidx/build/studio/StudioTask.kt
index 7b70cbc..e80fc19 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/studio/StudioTask.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/studio/StudioTask.kt
@@ -272,10 +272,9 @@
val userInput = services.get(UserInputHandler::class.java)
val acceptAgreement =
userInput.askYesNoQuestion(
- "Do you accept the license agreement at $licensePath?",
- /* default answer*/ false
+ "Do you accept the license agreement at $licensePath?"
)
- if (!acceptAgreement) {
+ if (acceptAgreement == null || !acceptAgreement) {
return false
}
licenseAcceptedFile.createNewFile()
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9323b06..04e7d66 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=../../../../tools/external/gradle/gradle-8.6-bin.zip
-distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
+distributionUrl=../../../../tools/external/gradle/gradle-8.7-rc-1-bin.zip
+distributionSha256Sum=4354bc6c46d1f1e1e37cb371b7c31556a4427eb3f57d03c23e5aae8aa606aedb
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/playground-common/gradle/wrapper/gradle-wrapper.properties b/playground-common/gradle/wrapper/gradle-wrapper.properties
index 6e3d090..4ec6c0c 100644
--- a/playground-common/gradle/wrapper/gradle-wrapper.properties
+++ b/playground-common/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
-distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-1-bin.zip
+distributionSha256Sum=4354bc6c46d1f1e1e37cb371b7c31556a4427eb3f57d03c23e5aae8aa606aedb
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/stableaidl/stableaidl-gradle-plugin/src/test/java/com/android/build/gradle/internal/fixtures/FakeGradleProperty.kt b/stableaidl/stableaidl-gradle-plugin/src/test/java/com/android/build/gradle/internal/fixtures/FakeGradleProperty.kt
index 8ca3a1e..2e7601c 100644
--- a/stableaidl/stableaidl-gradle-plugin/src/test/java/com/android/build/gradle/internal/fixtures/FakeGradleProperty.kt
+++ b/stableaidl/stableaidl-gradle-plugin/src/test/java/com/android/build/gradle/internal/fixtures/FakeGradleProperty.kt
@@ -103,6 +103,14 @@
throw NotImplementedError()
}
+ override fun unset(): Property<T> {
+ throw NotImplementedError()
+ }
+
+ override fun unsetConvention(): Property<T> {
+ throw NotImplementedError()
+ }
+
@Deprecated("Deprecated in Java")
override fun forUseAtConfigurationTime(): Provider<T> {
throw NotImplementedError()
