build: adopt new way of jvm configuration

Author: mhuster23

build.gradle.kts

@@ -77,19 +77,19 @@ subprojects {
     val kotlinApiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_6
     subproject.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
         if (!name.lowercase().contains("test")) {
-            this.kotlinOptions {
-                jvmTarget = "11"
-                freeCompilerArgs += listOf("-Xjvm-default=all-compatibility", "-Xexpect-actual-classes")
-                apiVersion = kotlinApiVersion.version
+            this.compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_11)
+                freeCompilerArgs.addAll(listOf("-Xjvm-default=all-compatibility", "-Xexpect-actual-classes"))
+                apiVersion.set(kotlinApiVersion)
             }
         }
     }
     subproject.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
         if (!name.lowercase().contains("test")) {
-            this.kotlinOptions {
-                jvmTarget = "11"
-                freeCompilerArgs += listOf("-Xjvm-default=all-compatibility")
-                apiVersion = kotlinApiVersion.version
+            this.compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_11)
+                freeCompilerArgs.addAll(listOf("-Xjvm-default=all-compatibility"))
+                apiVersion.set(kotlinApiVersion)
             }
         }
     }

bulk-model-sync-lib/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
 }
 
 kotlin {
+    jvmToolchain(11)
     js(IR) {
         browser {
             testTask {
@@ -13,7 +14,6 @@ kotlin {
         }
     }
     jvm {
-        jvmToolchain(11)
         testRuns["test"].executionTask.configure {
             useJUnitPlatform()
         }

modelql-core/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 /*
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -91,13 +93,11 @@ val generateVersionVariable by tasks.registering {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
     dependsOn(generateVersionVariable)
-    kotlinOptions {
-        jvmTarget = "11"
-        freeCompilerArgs += listOf("-Xjvm-default=all-compatibility")
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_11)
+        freeCompilerArgs.add("-Xjvm-default=all-compatibility")
     }
 }
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon>().all {
     dependsOn(generateVersionVariable)
-    kotlinOptions {
-    }
 }

modelql-html/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 /*
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,13 +74,13 @@ kotlin {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = "11"
-        freeCompilerArgs += listOf("-Xjvm-default=all-compatibility", "-Xcontext-receivers")
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_11)
+        freeCompilerArgs.addAll("-Xjvm-default=all-compatibility", "-Xcontext-receivers")
     }
 }
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon>().all {
-    kotlinOptions {
-        freeCompilerArgs += listOf("-Xcontext-receivers")
+    compilerOptions {
+        freeCompilerArgs.add("-Xcontext-receivers")
     }
 }