Skip to content

Gradle 9.2.0 #836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timtebeek merged 7 commits into from
Oct 31, 2025
Merged

Gradle 9.2.0 #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
594d644
Gradle 9.2.0
timtebeek Oct 29, 2025
1d6c7b2
Apply suggestions from code review
timtebeek Oct 29, 2025
857c1a3
Standardize the order of dependencies
timtebeek Oct 30, 2025
d46e0ea
Show that even pinning back the gradle version fails
timtebeek Oct 30, 2025
b06bd3d
Fallback to checking simpleName if type does not match
timtebeek Oct 31, 2025
edbc584
Tolerate missing method type information
timtebeek Oct 31, 2025
18988d5
Apply suggestions from code review
timtebeek Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,28 +64,25 @@ dependencies {
implementation("org.openrewrite:rewrite-maven")
implementation("org.openrewrite.recipe:rewrite-java-dependencies:${rewriteVersion}")
implementation("org.openrewrite.recipe:rewrite-static-analysis:${rewriteVersion}")
runtimeOnly("org.openrewrite:rewrite-java-17")

runtimeOnly("tech.picnic.error-prone-support:error-prone-contrib:${rewriteVersion}:recipes")
compileOnly("org.junit.jupiter:junit-jupiter-engine:5.13.3")
compileOnly("org.assertj:assertj-core:3.+")

compileOnly("org.projectlombok:lombok:latest.release")
annotationProcessor("org.projectlombok:lombok:latest.release")

testImplementation("org.openrewrite:rewrite-java-17")
testImplementation("org.openrewrite:rewrite-groovy")
testImplementation("org.openrewrite:rewrite-test")
testImplementation("org.openrewrite:rewrite-kotlin")
testImplementation("org.openrewrite.gradle.tooling:model:${rewriteVersion}")

annotationProcessor("org.openrewrite:rewrite-templating:${rewriteVersion}")
implementation("org.openrewrite:rewrite-templating:${rewriteVersion}")
compileOnly("com.google.errorprone:error_prone_core:2.+") {
exclude("com.google.auto.service", "auto-service-annotations")
exclude("io.github.eisop","dataflow-errorprone")
}

testImplementation("org.openrewrite:rewrite-java-21")
testImplementation("org.openrewrite:rewrite-groovy")
testImplementation("org.openrewrite:rewrite-test")
testImplementation("org.openrewrite:rewrite-kotlin")
testImplementation("org.openrewrite.gradle.tooling:model:${rewriteVersion}")
testRuntimeOnly(gradleApi())

testRuntimeOnly("com.tngtech.archunit:archunit:0.23.1")
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions src/main/java/org/openrewrite/java/testing/junit5/GradleUseJunitJupiter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,15 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}
break;
case "withType":
if (m.getSelect() == null ||
!TypeUtils.isOfClassType(m.getSelect().getType(), "org.gradle.api.tasks.TaskContainer") ||
!(m.getArguments().get(0) instanceof J.Identifier && "Test".equals(((J.Identifier) m.getArguments().get(0)).getSimpleName()))) {
if (m.getSelect() == null) {
return m;
}
if (!TypeUtils.isOfClassType(m.getSelect().getType(), "org.gradle.api.tasks.TaskContainer") &&
// With Gradle 9 we saw the type change to Object, so fall back to checking simple name
!(m.getSelect() instanceof J.Identifier && "tasks".equals(((J.Identifier) m.getSelect()).getSimpleName()))) {
return m;
}
if (!(m.getArguments().get(0) instanceof J.Identifier && "Test".equals(((J.Identifier) m.getArguments().get(0)).getSimpleName()))) {
return m;
}
break;
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/org/openrewrite/java/testing/mockito/CleanupMockitoImportsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.openrewrite.kotlin.KotlinParser;
import org.openrewrite.test.RecipeSpec;
import org.openrewrite.test.RewriteTest;
import org.openrewrite.test.TypeValidation;

import static org.openrewrite.java.Assertions.java;
import static org.openrewrite.kotlin.Assertions.kotlin;
Expand Down Expand Up @@ -288,6 +289,7 @@ public class MockitoArgumentMatchersTest {
@Test
void doNotRemoveMockitoImportsForKotlin() {
rewriteRun(
spec -> spec.typeValidationOptions(TypeValidation.all().methodInvocations(false)),
//language=kotlin
kotlin(
"""
Expand Down