azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
After the following changes:
* 290aded94f
* 33de71f792

default values of jvmTarget and javaHome started to overwrite properties
set through compileJava in core:descriptors.runtime
This commit is contained in:
Alexey Tsvetkov
2019-07-02 17:30:38 +03:00
parent d3f9d0866a
commit 35dea296fa
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.runtime/build.gradle.kts
+2 -9
View File
@@ -24,15 +24,8 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
val compileJava by tasks.getting(JavaCompile::class) { jvmTarget = "1.6"
sourceCompatibility = "1.6" javaHome = rootProject.extra["JDK_16"] as String
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") val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateRuntimeDescriptorTestsKt")