Tune build options for kotlin-test, kotlin-runtime, kotlin-stdlib, kotlin-stdlib-jre7/8

2017-01-19 05:15:53 +03:00
parent c5aa5ef571
commit 5755210498
7 changed files with 108 additions and 122 deletions
@@ -42,15 +42,17 @@ compileJava {
    sourceCompatibility = 1.6
    targetCompatibility = 1.6
    options.fork = true
-    // TODO: find how to fix on macos
-//    options.bootClasspath = "${System.getenv('JDK_16')}/jre/lib/rt.jar"
+    options.forkOptions.executable = "${JDK_16}/bin/javac"
 }

 compileKotlin {
-    kotlinOptions.freeCompilerArgs = [
-            "-Xallow-kotlin-package",
-            "-Xdump-declarations-to", "${buildDir}/runtime-declarations.json",
-            "-cp", "${rootDir}/../dist/builtins",
-            "-module-name", project.name
-    ]
+    kotlinOptions {
+        jdkHome = JDK_16
+        freeCompilerArgs = [
+                "-Xallow-kotlin-package",
+                "-Xdump-declarations-to", "${buildDir}/runtime-declarations.json",
+                "-cp", "${rootDir}/../dist/builtins",
+                "-module-name", project.name
+        ]
+    }
 }