Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ on:
branches:
- main
workflow_dispatch: {}
schedule:
- cron: 0 16 * * *

concurrency:
group: ci-${{ github.ref }}
Expand Down
26 changes: 0 additions & 26 deletions .github/workflows/nightly-ci.yml

This file was deleted.

10 changes: 5 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
plugins {
id("org.openrewrite.build.root") version("latest.release")
id("org.openrewrite.build.java-base") version("latest.release")
id("org.owasp.dependencycheck") version("latest.release")
id("org.openrewrite.build.root") version "latest.release"
id("org.openrewrite.build.java-base") version "latest.release"
id("org.owasp.dependencycheck") version "latest.release"
}

configure<org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension> {
analyzers.assemblyEnabled = false
analyzers.nodeAuditEnabled = false
analyzers.nodeEnabled = false
analyzers.nodeAudit { enabled = false }
analyzers.nodePackage { enabled = false }
failBuildOnCVSS = System.getenv("FAIL_BUILD_ON_CVSS")?.toFloatOrNull() ?: 9.0F
format = System.getenv("DEPENDENCY_CHECK_FORMAT") ?: "HTML"
nvd.apiKey = System.getenv("NVD_API_KEY")
Expand Down
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
98 changes: 0 additions & 98 deletions recipes.csv

This file was deleted.

2 changes: 1 addition & 1 deletion rewrite-benchmarks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {

jmh(project(":rewrite-core"))
jmh(project(":rewrite-java"))
jmh(project(":rewrite-java-21"))
jmh(project(":rewrite-java-25"))
jmh(project(":rewrite-maven"))
jmh("org.antlr:antlr4-runtime:4.13.2")
jmh("org.rocksdb:rocksdbjni:10.2.1")
Expand Down
8 changes: 0 additions & 8 deletions rewrite-bom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,3 @@ dependencies {
.forEach { api(it) }
}
}

publishing {
publications {
named("nebula", MavenPublication::class.java) {
from(components["javaPlatform"])
}
}
}
6 changes: 6 additions & 0 deletions rewrite-gradle-tooling-model/model/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ tasks.named<JavaCompile>("compileJava").configure {
options.release.set(8)
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}

val testGradle4 = tasks.register<Test>("testGradle4") {
systemProperty("org.openrewrite.test.gradleVersion", "4.10")
systemProperty("jarLocationForTest", tasks.named<Jar>("jar").get().archiveFile.get().asFile.absolutePath)
Expand Down
6 changes: 6 additions & 0 deletions rewrite-gradle/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ dependencies {

}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}

tasks.withType<Test>().configureEach {
dependsOn(pluginLocalTestClasspath)
systemProperty("org.openrewrite.gradle.local.use-embedded-classpath", pluginLocalTestClasspath.files.find { it.name == "test-manifest.txt" }!!.path)
Expand Down
7 changes: 7 additions & 0 deletions rewrite-groovy/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:Suppress("UnstableApiUsage")

plugins {
id("org.openrewrite.build.language-library")
id("jvm-test-suite")
Expand Down Expand Up @@ -33,6 +35,11 @@ testing {
}
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}

dependencies {
api(project(":rewrite-java"))
Expand Down
9 changes: 4 additions & 5 deletions rewrite-java-test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ tasks.withType<Javadoc>().configureEach {
exclude("org/openrewrite/java/**")
}

tasks.named<JavaCompile>("compileTestJava") {
sourceCompatibility = JavaVersion.VERSION_21.toString()
targetCompatibility = JavaVersion.VERSION_21.toString()

options.release.set(null as Int?) // remove `--release 8` set in `org.openrewrite.java-base`
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}

tasks.withType<Test>().configureEach {
Expand Down
6 changes: 6 additions & 0 deletions rewrite-java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ dependencies {
testRuntimeOnly("jakarta.validation:jakarta.validation-api:3.1.1")
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}

tasks.withType<Javadoc>().configureEach {
// generated ANTLR sources violate doclint
(options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
Expand Down
4 changes: 2 additions & 2 deletions rewrite-javascript/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
testImplementation(project(":rewrite-test"))
testImplementation(project(":rewrite-yaml"))
testImplementation("io.moderne:jsonrpc:latest.integration")
testRuntimeOnly(project(":rewrite-java-21"))
testRuntimeOnly(project(":rewrite-java-25"))
}

tasks.withType<Javadoc>().configureEach {
Expand Down Expand Up @@ -176,7 +176,7 @@ testing {

dependencies {
implementation(project())
implementation(project(":rewrite-java-21"))
implementation(project(":rewrite-java-25"))
implementation(project(":rewrite-test"))
implementation(project(":rewrite-json"))
implementation(project(":rewrite-java-tck"))
Expand Down
2 changes: 1 addition & 1 deletion rewrite-maven/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dependencies {
testImplementation("org.mapdb:mapdb:latest.release")

testRuntimeOnly("org.mapdb:mapdb:latest.release")
testRuntimeOnly(project(":rewrite-java-21"))
testRuntimeOnly(project(":rewrite-java-25"))
testRuntimeOnly("org.rocksdb:rocksdbjni:10.2.1")
}

Expand Down
2 changes: 1 addition & 1 deletion rewrite-test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ dependencies {

testImplementation(project(":rewrite-groovy"))
testRuntimeOnly("org.antlr:antlr4-runtime:4.13.2")
testRuntimeOnly(project(":rewrite-java-21"))
testRuntimeOnly(project(":rewrite-java-25"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some downstream projects rely on this transitive dependency for their Java parser. I wonder what using 25 here will do for their tests when those concern using gradle, but I'll guess we'll see over the next hours and otherwise change this back.

}
9 changes: 7 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ val allProjects = listOf(
"rewrite-java-tck",
"rewrite-java-test",
"rewrite-java-lombok",
"rewrite-java-17", // remove this when rewrite recipe gradle plugin moves to 21
"rewrite-java-21",
"rewrite-java-25",
"rewrite-javascript",
Expand Down Expand Up @@ -57,7 +56,13 @@ gradle.allprojects {
resolutionStrategy.dependencySubstitution {
allProjects
.minus(includedProjects)
.minus(arrayOf("rewrite-bom", "rewrite-gradle-tooling-model:model", "rewrite-gradle-tooling-model:plugin"))
.minus(
arrayOf(
"rewrite-bom",
"rewrite-gradle-tooling-model:model",
"rewrite-gradle-tooling-model:plugin"
)
)
.forEach {
substitute(project(":$it"))
.using(module("org.openrewrite:$it:latest.integration"))
Expand Down