Revert "Add ext.jvmTarget and ext.javaHome to core:descriptors.runtime"

This reverts commit 35dea296fa.
2019-07-03 12:40:02 +03:00
parent 1a290621b0
commit 9340bffd02
1 changed files with 9 additions and 2 deletions
@@ -24,8 +24,15 @@ sourceSets {
    "test" { projectDefault() }
 }

-jvmTarget = "1.6"
-javaHome = rootProject.extra["JDK_16"] as String
+val compileJava by tasks.getting(JavaCompile::class) {
+    sourceCompatibility = "1.6"
+    targetCompatibility = "1.6"
+}
+
+val compileKotlin by tasks.getting(KotlinCompile::class) {
+    kotlinOptions.jvmTarget = "1.6"
+    kotlinOptions.jdkHome = rootProject.extra["JDK_16"] as String
+}

 val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateRuntimeDescriptorTestsKt")