Upgradle to 8.5
Test: ./gradlew bOS --dry-run
Change-Id: Ib8ae93b2a0d56e9ecd0832d19694d43f9c19c16b
diff --git a/buildSrc-tests/src/test/java/androidx/build/dependencyTracker/AffectedModuleDetectorImplTest.kt b/buildSrc-tests/src/test/java/androidx/build/dependencyTracker/AffectedModuleDetectorImplTest.kt
index b1b65e6..88bc085 100644
--- a/buildSrc-tests/src/test/java/androidx/build/dependencyTracker/AffectedModuleDetectorImplTest.kt
+++ b/buildSrc-tests/src/test/java/androidx/build/dependencyTracker/AffectedModuleDetectorImplTest.kt
@@ -18,11 +18,11 @@
import java.io.File
import java.util.function.BiFunction
-import java.util.function.Predicate
import org.gradle.api.Project
import org.gradle.api.Transformer
import org.gradle.api.plugins.ExtraPropertiesExtension
import org.gradle.api.provider.Provider
+import org.gradle.api.specs.Spec
import org.gradle.testfixtures.ProjectBuilder
import org.hamcrest.CoreMatchers
import org.hamcrest.MatcherAssert
@@ -171,26 +171,24 @@
class TestProvider(private val list: List<String>) : Provider<List<String>> {
override fun get(): List<String> = list
override fun getOrNull(): List<String> = list
- override fun isPresent(): Boolean = TODO("used")
- override fun forUseAtConfigurationTime(): Provider<List<String>> = TODO("used")
+ override fun isPresent(): Boolean = TODO("unused")
+ override fun forUseAtConfigurationTime(): Provider<List<String>> = TODO("unused")
override fun <U : Any?, R : Any?> zip(
right: Provider<U>,
combiner: BiFunction<in List<String>, in U, out R?>
- ): Provider<R> = TODO("used")
+ ): Provider<R> = TODO("unused")
override fun orElse(provider: Provider<out List<String>>): Provider<List<String>> {
- TODO("used")
+ TODO("unused")
}
- override fun orElse(value: List<String>): Provider<List<String>> = TODO("used")
+ override fun orElse(value: List<String>): Provider<List<String>> = TODO("unused")
override fun <S : Any?> flatMap(
transformer: Transformer<out Provider<out S>?, in List<String>>
- ): Provider<S> = TODO("used")
- override fun filter(predicate: Predicate<in List<String>>): Provider<List<String>> {
- TODO("used")
- }
+ ): Provider<S> = TODO("unused")
+ override fun filter(spec: Spec<in List<String>>): Provider<List<String>> = TODO("unused")
override fun <S : Any?> map(
transformer: Transformer<out S?, in List<String>>
- ): Provider<S> = TODO("used")
- override fun getOrElse(defaultValue: List<String>): List<String> = TODO("used")
+ ): Provider<S> = TODO("unused")
+ override fun getOrElse(defaultValue: List<String>): List<String> = TODO("unused")
}
@Test
diff --git a/development/build_log_simplifier/messages.ignore b/development/build_log_simplifier/messages.ignore
index 491d65e..9fecfb4 100644
--- a/development/build_log_simplifier/messages.ignore
+++ b/development/build_log_simplifier/messages.ignore
@@ -30,6 +30,7 @@
Configuration cache entry reused\.
[0-9]+ actionable tasks: [0-9]+ executed, [0-9]+ from cache
Configuration cache entry stored\.
+Calculating task graph as no cached configuration is available for tasks.*
See the profiling report at\: file\:\/\/\$OUT_DIR\/androidx\/build\/reports\/profile\/profile\-[0-9]+\-[0-9]+\-[0-9]+\-[0-9]+\-[0-9]+\-[0-9]+\.html
# > Task :lifecycle:lifecycle-common:compileJava
Note: \$[^ ]+ uses or overrides a deprecated API\.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 48a5558..570dfce 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.4-bin.zip
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
+distributionUrl=../../../../tools/external/gradle/gradle-8.5-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
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 d55a029..9cac784 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.4-bin.zip
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
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 aaf77af..8ca3a1e 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
@@ -17,10 +17,10 @@
package com.android.build.gradle.internal.fixtures
import java.util.function.BiFunction
-import java.util.function.Predicate
import org.gradle.api.Transformer
import org.gradle.api.provider.Property
import org.gradle.api.provider.Provider
+import org.gradle.api.specs.Spec
class FakeGradleProperty<T>(private var value: T? = null) : Property<T> {
@@ -47,8 +47,7 @@
value ?: valueProvider?.get() ?: convention ?: throw IllegalStateException("Value not set")
override fun getOrNull() = value ?: valueProvider?.get() ?: convention
-
- override fun filter(predicate: Predicate<in T>): Provider<T> {
+ override fun filter(spec: Spec<in T>): Provider<T> {
throw NotImplementedError()
}
