JvmToolChain under Kotlin

Signed-off-by: Gopal S Akshintala <[email protected]>

Author: overfullstack

buildSrc/src/main/kotlin/preDef.kt

@@ -7,6 +7,7 @@
  */
 import org.gradle.api.artifacts.ExternalModuleDependencyBundle
 import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionConstraint
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.plugin.use.PluginDependency
@@ -18,7 +19,7 @@ infix fun <T> Property<T>.by(value: T) {
   set(value)
 }
 
-internal val VersionCatalog.jdk
+internal val VersionCatalog.jdk: VersionConstraint
   get() = getVersion("jdk")
 
 internal val VersionCatalog.kotestBundle: Provider<ExternalModuleDependencyBundle>

buildSrc/src/main/kotlin/revoman.kt-conventions.gradle.kts

@@ -18,8 +18,9 @@ kapt {
   useBuildCache = true
 }
 
-kotlin { 
+kotlin {
+  jvmToolchain(libs.jdk.toString().toInt())
   compilerOptions {
-    freeCompilerArgs.addAll("-Xjvm-default=all", "-Xcontext-receivers", "-Xjdk-release=${libs.jdk}", "-Xconsistent-data-class-copy-visibility")
+    freeCompilerArgs.addAll("-Xjvm-default=all", "-Xcontext-receivers", "-Xconsistent-data-class-copy-visibility")
   } 
 }

buildSrc/src/main/kotlin/revoman.publishing-conventions.gradle.kts

@@ -5,7 +5,6 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  * ************************************************************************************************
  */
-import org.gradle.kotlin.dsl.invoke
 
 plugins {
   `maven-publish`
@@ -21,12 +20,9 @@ description = "ReVoman - A template-driven API automation tool for JVM (Java/Kot
 
 repositories { mavenCentral() }
 
-val libs: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
-
 java {
   withJavadocJar()
   withSourcesJar()
-  toolchain { languageVersion.set(JavaLanguageVersion.of(libs.jdk.toString())) }
 }
 
 publishing {