Minor, remove obsolete jvmTarget modifications in compiler modules
Default JVM target (as well as JDK home) is set to 1.8 for all Gradle projects in build.gradle.kts:352.
This commit is contained in:
committed by
Alexander Udalov
parent
f403a0da82
commit
aad7354a3b
@@ -3,8 +3,6 @@ plugins {
|
|||||||
id("jps-compatible")
|
id("jps-compatible")
|
||||||
}
|
}
|
||||||
|
|
||||||
jvmTarget = "1.8"
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
compile(project(":compiler:util"))
|
||||||
compile(project(":compiler:cli-common"))
|
compile(project(":compiler:cli-common"))
|
||||||
|
|||||||
@@ -1,8 +1,3 @@
|
|||||||
/*
|
|
||||||
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
|
|
||||||
* that can be found in the license/LICENSE.txt file.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||||
|
|
||||||
description = "Kotlin Daemon New"
|
description = "Kotlin Daemon New"
|
||||||
@@ -12,8 +7,6 @@ plugins {
|
|||||||
id("jps-compatible")
|
id("jps-compatible")
|
||||||
}
|
}
|
||||||
|
|
||||||
jvmTarget = "1.8"
|
|
||||||
|
|
||||||
val ktorExcludesForDaemon : List<Pair<String, String>> by rootProject.extra
|
val ktorExcludesForDaemon : List<Pair<String, String>> by rootProject.extra
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -1,8 +1,3 @@
|
|||||||
/*
|
|
||||||
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
|
|
||||||
* that can be found in the license/LICENSE.txt file.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||||
|
|
||||||
description = "Kotlin Daemon Client New"
|
description = "Kotlin Daemon Client New"
|
||||||
@@ -12,8 +7,6 @@ plugins {
|
|||||||
id("jps-compatible")
|
id("jps-compatible")
|
||||||
}
|
}
|
||||||
|
|
||||||
jvmTarget = "1.8"
|
|
||||||
|
|
||||||
val nativePlatformVariants = listOf(
|
val nativePlatformVariants = listOf(
|
||||||
"windows-amd64",
|
"windows-amd64",
|
||||||
"windows-i386",
|
"windows-i386",
|
||||||
|
|||||||
@@ -23,11 +23,6 @@ sourceSets {
|
|||||||
"test" { projectDefault() }
|
"test" { projectDefault() }
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<KotlinCompile> {
|
|
||||||
kotlinOptions.jdkHome = rootProject.extra["JDK_18"]!!.toString()
|
|
||||||
kotlinOptions.jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
|
|
||||||
projectTest(parallel = true) {
|
projectTest(parallel = true) {
|
||||||
executable = "${rootProject.extra["JDK_18"]!!}/bin/java"
|
executable = "${rootProject.extra["JDK_18"]!!}/bin/java"
|
||||||
dependsOn(":dist")
|
dependsOn(":dist")
|
||||||
|
|||||||
Reference in New Issue
Block a user