Minor updates to the build files (#442)

* Minor updates to the build files * Remove javaToolchain, rely only on Kotlin's * Remove one more javaToolchain
JetBrains · Jul 15, 2024 · 26305b8 · 26305b8
1 parent 119c856
commit 26305b8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 25 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,9 +1,19 @@
+import java.util.Properties
+
 plugins {
     `kotlin-dsl`
     alias(libs.plugins.kotlinx.serialization)
 }
 
+val properties = Properties()
+project.file("../gradle.properties").inputStream().use { properties.load(it) }
+
+val jdkLevel = properties.getProperty("jdk.level") as String
 kotlin {
+    jvmToolchain {
+        languageVersion = JavaLanguageVersion.of(jdkLevel)
+    }
+
     sourceSets {
         all {
             languageSettings {

diff --git a/buildSrc/src/main/kotlin/jewel.gradle.kts b/buildSrc/src/main/kotlin/jewel.gradle.kts
@@ -19,13 +19,6 @@ version = when {
 }
 
 val jdkLevel = project.property("jdk.level") as String
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(jdkLevel)
-    }
-
-}
-
 kotlin {
     jvmToolchain {
         languageVersion = JavaLanguageVersion.of(jdkLevel)
@@ -87,14 +80,3 @@ configurations.named("sarif") {
         artifact(sarifReport) { builtBy(tasks.lintKotlinMain) }
     }
 }
-
-fun Task.removeAssembleDependency() {
-    setDependsOn(
-        dependsOn.filter {
-            when {
-                it is Task && it.name == "assemble" -> false
-                else -> true
-            }
-        }
-    )
-}
diff --git a/samples/standalone/build.gradle.kts b/samples/standalone/build.gradle.kts
@@ -21,14 +21,10 @@ dependencies {
     implementation(libs.intellijPlatform.icons)
 }
 
-java {
-    toolchain {
-        vendor = JvmVendorSpec.JETBRAINS
-    }
-}
-
+val jdkLevel = project.property("jdk.level") as String
 kotlin {
     jvmToolchain {
+        languageVersion = JavaLanguageVersion.of(jdkLevel)
         vendor = JvmVendorSpec.JETBRAINS
     }
 }
@@ -56,7 +52,6 @@ compose.desktop {
     }
 }
 
-val jdkLevel = project.property("jdk.level") as String
 tasks {
     withType<JavaExec> {
         // afterEvaluate is needed because the Compose Gradle Plugin