From 1bf3174435f058e85ccfdbccaf3928279bd86374 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 22:11:39 +0000 Subject: [PATCH 1/2] Update dependency gradle to v8.10.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dedd5d1e6..79eb9d003 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=https\://services.gradle.org/distributions/gradle-8.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From fc5d5cd2bb158550ab8e474c1715ed90b8eeb343 Mon Sep 17 00:00:00 2001 From: Rick Busarow Date: Thu, 31 Oct 2024 11:34:52 -0500 Subject: [PATCH 2/2] remove the check for Gradle < 8.5 in LifecycleTest There's no need to test back that far anymore, and we don't. The simple version check we had doesn't work since "8.10" is less than "8.5", and there's no need to fix it instead of just removing it. --- .../java/com/squareup/anvil/plugin/LifecycleTest.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gradle-plugin/src/gradleTest/java/com/squareup/anvil/plugin/LifecycleTest.kt b/gradle-plugin/src/gradleTest/java/com/squareup/anvil/plugin/LifecycleTest.kt index 008db115e..e757b44ba 100644 --- a/gradle-plugin/src/gradleTest/java/com/squareup/anvil/plugin/LifecycleTest.kt +++ b/gradle-plugin/src/gradleTest/java/com/squareup/anvil/plugin/LifecycleTest.kt @@ -26,7 +26,7 @@ class LifecycleTest : BaseGradleTest() { fun `tasks are compatible with configuration caching when targeting kotlin-jvm`() = params .distinctBy { it.gradleVersion } - .withKspToggle { versions, useKsp -> + .withKspToggle { _, useKsp -> rootProject { buildFile { @@ -44,10 +44,8 @@ class LifecycleTest : BaseGradleTest() { } } - val calculatingMessage = when { - versions.gradleVersion >= "8.5" -> "Calculating task graph as no cached configuration is available for tasks: compileKotlin" - else -> "Calculating task graph as no configuration cache is available for tasks: compileKotlin" - } + val calculatingMessage = + "Calculating task graph as no cached configuration is available for tasks: compileKotlin" val storingMessage = "Configuration cache entry stored."