chore: Update build script

Over-Run · Dec 7, 2024 · a0a0f3f · a0a0f3f
1 parent 6af8065
commit a0a0f3f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,9 +4,9 @@ plugins {
     signing
 }
 
-val projGroupId: String by project
-val projVersion: String by project
-val projLicenseYear: String by project
+val projGroupId: String by rootProject
+val projVersion: String by rootProject
+val projLicenseYear: String by rootProject
 
 val jdkVersion: String by rootProject
 val jdkEnablePreview: String by rootProject

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins { `kotlin-dsl` }
 
 val kotlinPluginVersion: String by rootProject
+val kotlinTargetJdkVersion: String by rootProject
 
 repositories {
     mavenCentral()
@@ -9,3 +10,9 @@ repositories {
 dependencies {
     implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:$kotlinPluginVersion")
 }
+
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(kotlinTargetJdkVersion))
+    }
+}
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
@@ -1 +1,2 @@
 kotlinPluginVersion=2.1.0
+kotlinTargetJdkVersion=22
diff --git a/buildSrc/src/main/kotlin/generator.conventions.gradle.kts b/buildSrc/src/main/kotlin/generator.conventions.gradle.kts
@@ -1,10 +1,6 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins { kotlin("jvm") }
 
 val javaPoetVersion: String by rootProject
-val jdkVersion: String by rootProject
 val kotlinTargetJdkVersion: String by rootProject
 
 repositories {
@@ -15,13 +11,8 @@ dependencies {
     implementation("com.palantir.javapoet:javapoet:$javaPoetVersion")
 }
 
-tasks.withType<KotlinCompile> {
-    compilerOptions { jvmTarget.set(JvmTarget.fromTarget(kotlinTargetJdkVersion)) }
-}
-
-tasks.withType<JavaCompile> {
-    javaCompiler.set(javaToolchains.compilerFor {
-        targetCompatibility = kotlinTargetJdkVersion
-        languageVersion.set(JavaLanguageVersion.of(jdkVersion))
-    })
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(kotlinTargetJdkVersion))
+    }
 }
diff --git a/...c/main/java/overrungl/nfd/NFDGenerator.kt → ...main/kotlin/overrungl/nfd/NFDGenerator.kt b/...c/main/java/overrungl/nfd/NFDGenerator.kt → ...main/kotlin/overrungl/nfd/NFDGenerator.kt
diff --git a/modules/overrungl.joml/build.gradle.kts b/modules/overrungl.joml/build.gradle.kts
@@ -8,7 +8,7 @@ overrunglModule {
     publishInfo = Artifact.JOML
 }
 
-val jomlVersion: String by project
+val jomlVersion: String by rootProject
 
 dependencies {
     api("org.joml:joml:$jomlVersion")
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		kotlinPluginVersion=2.1.0
		kotlinTargetJdkVersion=22