Switch Kotlin project to jvm-target 1.8

#KT-29405
2019-01-28 16:24:55 +01:00
parent 3e9c290a3a
commit a122cba862
55 changed files with 3 additions and 114 deletions
@@ -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(":kotlin-annotations-jvm"))
    compile(project(":compiler:util"))
@@ -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 }

@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":core:util.runtime"))
    compile(project(":compiler:frontend"))
@@ -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"))
@@ -3,8 +3,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":core:util.runtime"))
    compile(commonDep("javax.inject"))
@@ -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"))
@@ -8,8 +8,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":core:descriptors"))

@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":compiler:frontend.common"))
    compile(project(":compiler:frontend.java"))
@@ -8,8 +8,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":compiler:psi"))
    compile(project(":core:descriptors"))
@@ -8,8 +8,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":core:descriptors"))
    compile(project(":core:deserialization"))
@@ -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"))

@@ -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"))
@@ -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"))
@@ -3,8 +3,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:frontend"))
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:frontend"))
@@ -3,8 +3,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:frontend"))
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(intellijDep())
    compile(project(":compiler:util"))
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:backend"))
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:frontend"))
@@ -6,8 +6,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
 }
@@ -13,8 +13,6 @@ repositories {
    maven("https://jetbrains.bintray.com/intellij-third-party-dependencies")
 }

-jvmTarget = "1.6"
-
 val jflexPath by configurations.creating

 dependencies {
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":compiler:util"))
    compile(project(":core:descriptors"))
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:frontend"))
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(kotlinStdlib())
    compile(project(":core:deserialization"))
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(intellijDep()) { includeJars("util") }
    testCompile(project(":core:util.runtime"))
@@ -6,8 +6,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(kotlinStdlib())
    compile(project(":compiler:cli-common"))
@@ -6,8 +6,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(kotlinStdlib())
    compile(project(":compiler:cli-common"))
@@ -6,8 +6,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(kotlinStdlib())
    compile(project(":compiler:cli-common"))
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:frontend"))
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:frontend"))
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:frontend"))
@@ -6,8 +6,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":core:descriptors"))
    compile(project(":compiler:util"))
@@ -5,8 +5,6 @@ plugins {

 description = "Kotlin/Native deserializer and library reader"

-jvmTarget = "1.6"
-
 dependencies {

    // Compile-only dependencies are needed for compilation of this module:
@@ -5,8 +5,6 @@ plugins {

 description = "Kotlin/Native utils"

-jvmTarget = "1.6"
-
 dependencies {
    compile(kotlinStdlib())
 }
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":kotlin-script-runtime"))
    compile(kotlinStdlib())
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":kotlin-script-runtime"))
    compile(kotlinStdlib())
@@ -72,6 +72,9 @@
                        <goals> <goal>compile</goal> </goals>
                    </execution>
                </executions>
+                <configuration>
+                    <jvmTarget>1.8</jvmTarget>
+                </configuration>
            </plugin>
            <plugin>
                <groupId>org.codehaus.plexus</groupId>
@@ -4,8 +4,6 @@ import java.io.File
 apply { plugin("java") }
 apply { plugin("jps-compatible") }

-jvmTarget = "1.6"
-
 sourceSets {
    "main" { projectDefault() }
    "test" {}
@@ -6,8 +6,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":kotlin-allopen-compiler-plugin"))
    compile(project(":compiler:util"))
@@ -6,8 +6,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    testRuntime(intellijDep())

@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:frontend"))
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(kotlinStdlib())
    compile(project(":compiler:frontend"))
@@ -5,8 +5,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }

@@ -6,8 +6,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":kotlinx-serialization-compiler-plugin"))
    compile(project(":idea"))
@@ -6,8 +6,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":kotlin-noarg-compiler-plugin"))
    compile(project(":compiler:util"))
@@ -6,8 +6,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(project(":kotlin-sam-with-receiver-compiler-plugin"))
    compile(project(":plugins:annotation-based-compiler-plugins-ide-support"))
@@ -4,8 +4,6 @@ plugins {
    id("jps-compatible")
 }

-jvmTarget = "1.6"
-
 dependencies {
    compile(intellijDep()) {
        includeJars("platform-api", "platform-impl", "extensions", rootProject = rootProject)