Switch Kotlin project to jvm-target 1.8

#KT-29405
This commit is contained in:
Mikhael Bogdanov
2019-01-28 16:24:55 +01:00
parent 3e9c290a3a
commit a122cba862
55 changed files with 3 additions and 114 deletions
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
-2
View File
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":kotlin-annotations-jvm"))
compile(project(":compiler:util"))
-8
View File
@@ -8,14 +8,6 @@ plugins {
id("jps-compatible")
}
tasks.named<KotlinJvmCompile>("compileKotlin") {
kotlinOptions.jvmTarget = "1.6"
}
tasks.named<KotlinJvmCompile>("compileTestKotlin") {
kotlinOptions.jvmTarget = "1.8"
}
val compilerModules: Array<String> by rootProject.extra
val otherCompilerModules = compilerModules.filter { it != path }
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":core:util.runtime"))
compile(project(":compiler:frontend"))
-2
View File
@@ -6,8 +6,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(kotlinStdlib())
}
@@ -8,8 +8,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":kotlin-build-common"))
compileOnly(project(":compiler:cli-common"))
-2
View File
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":core:util.runtime"))
compile(commonDep("javax.inject"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:cli"))
compile(project(":compiler:daemon-common"))
@@ -7,8 +7,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
val nativePlatformVariants = listOf(
"windows-amd64",
"windows-i386",
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
-2
View File
@@ -8,8 +8,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":core:descriptors"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:frontend.common"))
compile(project(":compiler:frontend.java"))
-2
View File
@@ -8,8 +8,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:psi"))
compile(project(":core:descriptors"))
-2
View File
@@ -8,8 +8,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":core:descriptors"))
compile(project(":core:deserialization"))
-2
View File
@@ -8,8 +8,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:frontend.common"))
compile(project(":core:descriptors"))
@@ -10,8 +10,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:psi"))
-2
View File
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":kotlin-annotations-jvm"))
compile(project(":core:descriptors"))
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
-2
View File
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
-2
View File
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(intellijDep())
compile(project(":compiler:util"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:backend"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
-2
View File
@@ -6,8 +6,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
}
-2
View File
@@ -13,8 +13,6 @@ repositories {
maven("https://jetbrains.bintray.com/intellij-third-party-dependencies")
}
jvmTarget = "1.6"
val jflexPath by configurations.creating
dependencies {
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:util"))
compile(project(":core:descriptors"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
dependencies {
compile(kotlinStdlib())
compile(project(":core:deserialization"))