From 35dea296fa289146ab34563fe9f4e78447f12436 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Tue, 2 Jul 2019 17:30:38 +0300
Subject: [PATCH] Add ext.jvmTarget and ext.javaHome to
 core:descriptors.runtime

After the following changes:
* 290aded94f7d88706354640d156db5f32fabf2c4
* 33de71f7920d0d7e9986145e584a38613856e551

default values of jvmTarget and javaHome started to overwrite properties
set through compileJava in core:descriptors.runtime
---
 core/descriptors.runtime/build.gradle.kts | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts
index ff01d6e1deb..e6bb6e38327 100644
--- a/core/descriptors.runtime/build.gradle.kts
+++ b/core/descriptors.runtime/build.gradle.kts
@@ -24,15 +24,8 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-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
-}
+jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
 
 val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateRuntimeDescriptorTestsKt")