diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index 8186a0d76..4c2df950e 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -18,7 +18,7 @@ configure { } } -val buf: Configuration by configurations.creating +val buf = configurations.create("buf") tasks.register("configureBuf") { description = "Installs the Buf CLI." diff --git a/build.gradle.kts b/build.gradle.kts index 4255d3a7b..bc7189bd0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,7 @@ if (matchResult != null) { } val releaseVersion = project.findProperty("releaseVersion") as String? ?: snapshotVersion -val buf: Configuration by configurations.creating +val buf = configurations.create("buf") val bufLicenseHeaderCLIFile = project.layout.buildDirectory .file("gobin/license-header") @@ -268,11 +268,9 @@ tasks.matching { it.name == "sourcesJar" }.configureEach { tasks.withType { dependsOn("generate") - if (JavaVersion.current().isJava9Compatible) { - doFirst { - options.compilerArgs = mutableListOf("--release", "8") - } - } + options.release = 8 + // JDK 9+ javac warns that release 8 is obsolete. + options.compilerArgs.add("-Xlint:-options") // Disable errorprone on generated code options.errorprone.excludedPaths.set(".*/build/generated/.*") if (!name.lowercase().contains("test")) { diff --git a/conformance/build.gradle.kts b/conformance/build.gradle.kts index 297c6e307..919b4a806 100644 --- a/conformance/build.gradle.kts +++ b/conformance/build.gradle.kts @@ -16,7 +16,7 @@ java { targetCompatibility = JavaVersion.VERSION_21 } -val buf: Configuration by configurations.creating +val buf = configurations.create("buf") tasks.register("configureBuf") { description = "Installs the Buf CLI." @@ -96,11 +96,9 @@ sourceSets { tasks.withType { dependsOn("generateConformance") - if (JavaVersion.current().isJava9Compatible) { - doFirst { - options.compilerArgs = mutableListOf("--release", "8") - } - } + options.release = 8 + // JDK 9+ javac warns that release 8 is obsolete. + options.compilerArgs.add("-Xlint:-options") // Disable errorprone on generated code options.errorprone.excludedPaths.set(".*/build/generated/sources/bufgen/.*") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c9813148b..466745b2b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,6 +25,6 @@ spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = [plugins] errorprone = { id = "net.ltgt.errorprone", version = "5.1.1" } -jmh = { id = "me.champeau.jmh", version = "0.7.3" } +jmh = { id = "me.champeau.jmh", version = "0.7.4" } maven = { id = "com.vanniktech.maven.publish.base", version.ref = "maven-publish" } osdetector = { id = "com.google.osdetector", version = "1.7.3" }