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") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":core:descriptors")) compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm")) compile(project(":core:descriptors.jvm"))
-2
View File
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":kotlin-annotations-jvm")) compile(project(":kotlin-annotations-jvm"))
compile(project(":compiler:util")) compile(project(":compiler:util"))
-8
View File
@@ -8,14 +8,6 @@ plugins {
id("jps-compatible") 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 compilerModules: Array<String> by rootProject.extra
val otherCompilerModules = compilerModules.filter { it != path } val otherCompilerModules = compilerModules.filter { it != path }
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":core:util.runtime")) compile(project(":core:util.runtime"))
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
-2
View File
@@ -6,8 +6,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(kotlinStdlib()) compile(kotlinStdlib())
} }
@@ -8,8 +8,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":kotlin-build-common")) compile(project(":kotlin-build-common"))
compileOnly(project(":compiler:cli-common")) compileOnly(project(":compiler:cli-common"))
-2
View File
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":core:util.runtime")) compile(project(":core:util.runtime"))
compile(commonDep("javax.inject")) compile(commonDep("javax.inject"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:cli")) compile(project(":compiler:cli"))
compile(project(":compiler:daemon-common")) compile(project(":compiler:daemon-common"))
@@ -7,8 +7,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
val nativePlatformVariants = listOf( val nativePlatformVariants = listOf(
"windows-amd64", "windows-amd64",
"windows-i386", "windows-i386",
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":core:descriptors")) compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm")) compile(project(":core:descriptors.jvm"))
-2
View File
@@ -8,8 +8,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":core:descriptors")) compile(project(":core:descriptors"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:frontend.common")) compile(project(":compiler:frontend.common"))
compile(project(":compiler:frontend.java")) compile(project(":compiler:frontend.java"))
-2
View File
@@ -8,8 +8,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:psi")) compile(project(":compiler:psi"))
compile(project(":core:descriptors")) compile(project(":core:descriptors"))
-2
View File
@@ -8,8 +8,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":core:descriptors")) compile(project(":core:descriptors"))
compile(project(":core:deserialization")) compile(project(":core:deserialization"))
-2
View File
@@ -8,8 +8,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:frontend.common")) compile(project(":compiler:frontend.common"))
compile(project(":core:descriptors")) compile(project(":core:descriptors"))
@@ -10,8 +10,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:psi")) compile(project(":compiler:psi"))
-2
View File
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":core:descriptors")) compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm")) compile(project(":core:descriptors.jvm"))
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":kotlin-annotations-jvm")) compile(project(":kotlin-annotations-jvm"))
compile(project(":core:descriptors")) compile(project(":core:descriptors"))
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":core:descriptors")) compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm")) compile(project(":core:descriptors.jvm"))
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
-2
View File
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
-2
View File
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(intellijDep()) compile(intellijDep())
compile(project(":compiler:util")) compile(project(":compiler:util"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:backend")) compile(project(":compiler:backend"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
-2
View File
@@ -6,8 +6,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) } compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
} }
-2
View File
@@ -13,8 +13,6 @@ repositories {
maven("https://jetbrains.bintray.com/intellij-third-party-dependencies") maven("https://jetbrains.bintray.com/intellij-third-party-dependencies")
} }
jvmTarget = "1.6"
val jflexPath by configurations.creating val jflexPath by configurations.creating
dependencies { dependencies {
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":core:descriptors")) compile(project(":core:descriptors"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(kotlinStdlib()) compile(kotlinStdlib())
compile(project(":core:deserialization")) compile(project(":core:deserialization"))
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(intellijDep()) { includeJars("util") } compile(intellijDep()) { includeJars("util") }
testCompile(project(":core:util.runtime")) testCompile(project(":core:util.runtime"))
@@ -6,8 +6,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(kotlinStdlib()) compile(kotlinStdlib())
compile(project(":compiler:cli-common")) compile(project(":compiler:cli-common"))
@@ -6,8 +6,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(kotlinStdlib()) compile(kotlinStdlib())
compile(project(":compiler:cli-common")) compile(project(":compiler:cli-common"))
@@ -6,8 +6,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(kotlinStdlib()) compile(kotlinStdlib())
compile(project(":compiler:cli-common")) compile(project(":compiler:cli-common"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
-2
View File
@@ -6,8 +6,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":core:descriptors")) compile(project(":core:descriptors"))
compile(project(":compiler:util")) compile(project(":compiler:util"))
-2
View File
@@ -5,8 +5,6 @@ plugins {
description = "Kotlin/Native deserializer and library reader" description = "Kotlin/Native deserializer and library reader"
jvmTarget = "1.6"
dependencies { dependencies {
// Compile-only dependencies are needed for compilation of this module: // Compile-only dependencies are needed for compilation of this module:
-2
View File
@@ -5,8 +5,6 @@ plugins {
description = "Kotlin/Native utils" description = "Kotlin/Native utils"
jvmTarget = "1.6"
dependencies { dependencies {
compile(kotlinStdlib()) compile(kotlinStdlib())
} }
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":kotlin-script-runtime")) compile(project(":kotlin-script-runtime"))
compile(kotlinStdlib()) compile(kotlinStdlib())
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":kotlin-script-runtime")) compile(project(":kotlin-script-runtime"))
compile(kotlinStdlib()) compile(kotlinStdlib())
@@ -72,6 +72,9 @@
<goals> <goal>compile</goal> </goals> <goals> <goal>compile</goal> </goals>
</execution> </execution>
</executions> </executions>
<configuration>
<jvmTarget>1.8</jvmTarget>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
@@ -4,8 +4,6 @@ import java.io.File
apply { plugin("java") } apply { plugin("java") }
apply { plugin("jps-compatible") } apply { plugin("jps-compatible") }
jvmTarget = "1.6"
sourceSets { sourceSets {
"main" { projectDefault() } "main" { projectDefault() }
"test" {} "test" {}
@@ -6,8 +6,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":kotlin-allopen-compiler-plugin")) compile(project(":kotlin-allopen-compiler-plugin"))
compile(project(":compiler:util")) compile(project(":compiler:util"))
@@ -6,8 +6,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
testRuntime(intellijDep()) testRuntime(intellijDep())
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(kotlinStdlib()) compile(kotlinStdlib())
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
@@ -5,8 +5,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
@@ -6,8 +6,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":kotlinx-serialization-compiler-plugin")) compile(project(":kotlinx-serialization-compiler-plugin"))
compile(project(":idea")) compile(project(":idea"))
-2
View File
@@ -6,8 +6,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":kotlin-noarg-compiler-plugin")) compile(project(":kotlin-noarg-compiler-plugin"))
compile(project(":compiler:util")) compile(project(":compiler:util"))
@@ -6,8 +6,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(project(":kotlin-sam-with-receiver-compiler-plugin")) compile(project(":kotlin-sam-with-receiver-compiler-plugin"))
compile(project(":plugins:annotation-based-compiler-plugins-ide-support")) compile(project(":plugins:annotation-based-compiler-plugins-ide-support"))
-2
View File
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
jvmTarget = "1.6"
dependencies { dependencies {
compile(intellijDep()) { compile(intellijDep()) {
includeJars("platform-api", "platform-impl", "extensions", rootProject = rootProject) includeJars("platform-api", "platform-impl", "extensions", rootProject = rootProject)