Added kotlin jvmToolchain and set toolchain version 17 and vendor ADOPTIUM

Author: dkrasnoff

build.gradle.kts

@@ -8,7 +8,6 @@ val policy: String by System.getProperties()
 
 group = "com.compiler.server"
 version = "$kotlinVersion-SNAPSHOT"
-java.sourceCompatibility = JavaVersion.VERSION_17
 
 val propertyFile = "application.properties"
 
@@ -20,6 +19,11 @@ plugins {
     kotlin("plugin.spring") version "$kotlinVersion"
 }
 
+kotlin.jvmToolchain {
+    languageVersion.set(JavaLanguageVersion.of(17))
+    vendor.set(JvmVendorSpec.ADOPTIUM)
+}
+
 apply<NodeJsRootPlugin>()
 
 allprojects {
@@ -71,7 +75,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-script-runtime:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-compiler-for-ide:$kotlinIdeVersion"){
+    implementation("org.jetbrains.kotlin:kotlin-compiler-for-ide:$kotlinIdeVersion") {
         isTransitive = false
     }
     implementation("org.jetbrains.kotlin:core:231-$kotlinIdeVersion-$kotlinIdeVersionSuffix")
@@ -112,16 +116,9 @@ fun generateProperties(prefix: String = "") = """
     server.compression.mime-types=application/json,text/javascript,application/wasm
 """.trimIndent()
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of("17"))
-    }
-}
-
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "17"
+    compilerOptions {
+        freeCompilerArgs.set(listOf("-Xjsr305=strict"))
     }
     dependsOn(":dependencies:copyDependencies")
     dependsOn(":dependencies:copyJSDependencies")
@@ -144,7 +141,9 @@ val buildLambda by tasks.creating(Zip::class) {
     from(tasks.compileKotlin)
     from(tasks.processResources) {
         eachFile {
-            if (name == propertyFile) { file.writeText(generateProperties(lambdaWorkDirectoryPath)) }
+            if (name == propertyFile) {
+                file.writeText(generateProperties(lambdaWorkDirectoryPath))
+            }
         }
     }
     from(policy)

executors/build.gradle.kts

@@ -1,22 +1,16 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
   kotlin("jvm")
 }
 
-java.sourceCompatibility = JavaVersion.VERSION_17
+kotlin.jvmToolchain {
+  languageVersion.set(JavaLanguageVersion.of(17))
+  vendor.set(JvmVendorSpec.ADOPTIUM)
+}
 
 dependencies {
   implementation("junit:junit:4.13.2")
 }
 
-tasks.withType<KotlinCompile> {
-  compilerOptions {
-    jvmTarget.set(JvmTarget.JVM_17)
-  }
-}
-
 tasks.withType<Jar>().getByName("jar") {
   destinationDirectory.set(libJVMFolder)
 }

src/test/resources/test-compile-output/jvm/kotlin-web-site/exceptions/0fdaa0696df279b79f2d2c63fe005f95.1.json

@@ -1 +1 @@
-{"errors":{"File.kt":[]},"exception":{"message":"Hi There!","fullName":"java.lang.Exception","stackTrace":[{"className":"FileKt","methodName":"main","fileName":"File.kt","lineNumber":3},{"className":"FileKt","methodName":"main","fileName":"File.kt","lineNumber":-1},{"className":"jdk.internal.reflect.DirectMethodHandleAccessor","methodName":"invoke","fileName":"DirectMethodHandleAccessor.java","lineNumber":104}],"cause":null,"localizedMessage":null},"jvmByteCode":null,"text":""}
+{"errors":{"File.kt":[]},"exception":{"message":"Hi There!","fullName":"java.lang.Exception","stackTrace":[{"className":"FileKt","methodName":"main","fileName":"File.kt","lineNumber":3},{"className":"FileKt","methodName":"main","fileName":"File.kt","lineNumber":-1},{"className":"jdk.internal.reflect.NativeMethodAccessorImpl","methodName":"invoke0","fileName":"NativeMethodAccessorImpl.java","lineNumber":-2}],"cause":null,"localizedMessage":null},"jvmByteCode":null,"text":""}

src/test/resources/test-compile-output/jvm/kotlin-web-site/strings/684a78155560e29c60cfedf300a516a1.6.json

@@ -1 +1 @@
-{"errors":{"File.kt":[]},"exception":null,"jvmByteCode":null,"text":"<outStream>0031416\n+3,1416\nHELLO WORLD\n(31416) means -31416\n</outStream>"}
+{"errors":{"File.kt":[]},"exception":null,"jvmByteCode":null,"text":"<outStream>0031416\n+3.1416\nHELLO WORLD\n(31416) means -31416\n</outStream>"}

src/test/resources/test-compile-output/jvm/kotlin-web-site/time-measurement/ef8a72a1b61d7d07ffc19fed4326e604.3.json

@@ -1 +1 @@
-{"errors":{"File.kt":[]},"exception":null,"jvmByteCode":null,"text":"<outStream>5,89s\n</outStream>"}
+{"errors":{"File.kt":[]},"exception":null,"jvmByteCode":null,"text":"<outStream>5.89s\n</outStream>"}