updates for java version

bufbuild · Jan 17, 2024 · 1095507 · 1095507
1 parent acb2312
commit 1095507
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -38,6 +38,9 @@ dependencies {
     testImplementation(libs.truth)
 }
 
+val targetJavaVersion = JavaVersion.VERSION_1_8
+val targetKotlinVersion = "1.6"
+
 configure<JavaPluginExtension> {
     sourceCompatibility = targetJavaVersion
     targetCompatibility = targetJavaVersion
@@ -60,8 +63,6 @@ gradlePlugin {
 ext[GRADLE_PUBLISH_KEY] = System.getenv("GRADLE_PORTAL_PUBLISH_KEY")
 ext[GRADLE_PUBLISH_SECRET] = System.getenv("GRADLE_PORTAL_PUBLISH_SECRET")
 
-val targetJavaVersion = JavaVersion.VERSION_1_8
-
 tasks {
     named("publishPlugins") {
         enabled = isRelease()
@@ -75,6 +76,21 @@ tasks {
         kotlinOptions {
             allWarningsAsErrors = true
             jvmTarget = targetJavaVersion.toString()
+            languageVersion = targetKotlinVersion
+            apiVersion = targetKotlinVersion
+            if (JavaVersion.current().isJava9Compatible) {
+                freeCompilerArgs += "-Xjdk-release=1.8"
+            }
+        }
+    }
+
+    withType<JavaCompile> {
+        if (JavaVersion.current().isJava9Compatible) {
+            doFirst {
+                options.compilerArgs = listOf("--release", "8")
+            }
         }
+        sourceCompatibility = targetJavaVersion.toString()
+        targetCompatibility = targetJavaVersion.toString()
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 # plugins
 animalsniffer = "1.7.1"
-kotlin = "1.6.20"
+kotlin = "1.9.20"
 pluginPublish = "1.2.1"
 publishing = "0.25.3"
 spotless = "6.24.0"

diff --git a/src/main/kotlin/build/buf/gradle/BufSupport.kt b/src/main/kotlin/build/buf/gradle/BufSupport.kt
@@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets
 const val BUF_BINARY_CONFIGURATION_NAME = "bufTool"
 
 internal fun Project.configureBufDependency() {
-    val os = System.getProperty("os.name").toLowerCase()
+    val os = System.getProperty("os.name").lowercase()
     val osPart =
         when {
             os.startsWith("windows") -> "windows"
@@ -31,7 +31,7 @@ internal fun Project.configureBufDependency() {
         }
 
     val archPart =
-        when (val arch = System.getProperty("os.arch").toLowerCase()) {
+        when (val arch = System.getProperty("os.arch").lowercase()) {
             in setOf("x86_64", "amd64") -> "x86_64"
             in setOf("arm64", "aarch64") -> "aarch_64"
             else -> error("unsupported arch: $arch")

diff --git a/src/main/kotlin/build/buf/gradle/OutputSupport.kt b/src/main/kotlin/build/buf/gradle/OutputSupport.kt
@@ -20,6 +20,7 @@ import java.io.File
 
 const val BUF_BUILD_DIR = "bufbuild"
 
+@Suppress("DEPRECATION") // https://docs.gradle.org/current/userguide/upgrading_version_8.html#deprecations_3
 internal val Project.bufbuildDir
     get() = File(buildDir, BUF_BUILD_DIR)
 

diff --git a/src/test/kotlin/build/buf/gradle/AbstractBufIntegrationTest.kt b/src/test/kotlin/build/buf/gradle/AbstractBufIntegrationTest.kt
@@ -45,7 +45,7 @@ abstract class AbstractBufIntegrationTest : IntegrationTest {
                 .replace("--", "")
                 .replace(" ", "_")
                 .replace("-", "_")
-                .toLowerCase(Locale.US)
+                .lowercase(Locale.US)
         val fixture = File("src/test/resources/${testInfo.testClass.get().simpleName}/$testName")
         assertWithMessage("Directory ${fixture.path} does not exist").that(fixture.exists()).isTrue()
         assertWithMessage("Failed to copy test fixture files").that(fixture.copyRecursively(projectDir)).isTrue()