From 64c3bcd9ab15cc234d0b79fb34ed632f2f92bca3 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 22 Feb 2019 21:17:11 +0100 Subject: [PATCH] Drop refactored-out frontend.script module --- build.gradle.kts | 2 -- compiler/cli/build.gradle.kts | 1 - compiler/cli/cli-common/build.gradle.kts | 1 - compiler/frontend.script/build.gradle.kts | 20 ------------------- .../org.jetbrains.kotlin.script.ScriptHelper | 1 - idea/build.gradle.kts | 1 - idea/idea-core/build.gradle.kts | 1 - idea/idea-gradle-native/build.gradle.kts | 1 - idea/idea-gradle/build.gradle.kts | 1 - idea/idea-test-framework/build.gradle.kts | 1 - nj2k/nj2k-services/build.gradle.kts | 1 - .../scripting-compiler-impl/build.gradle.kts | 3 --- .../scripting-compiler/build.gradle.kts | 1 - .../source-sections-compiler/build.gradle.kts | 2 -- prepare/idea-plugin/build.gradle.kts | 1 - settings.gradle | 1 - 16 files changed, 39 deletions(-) delete mode 100644 compiler/frontend.script/build.gradle.kts delete mode 100644 compiler/frontend.script/resources/META-INF/services/org.jetbrains.kotlin.script.ScriptHelper diff --git a/build.gradle.kts b/build.gradle.kts index b166a985c0a..ad4808870b0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.plugins.ide.idea.model.IdeaModel -import org.gradle.api.file.FileCollection import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import proguard.gradle.ProGuardTask @@ -204,7 +203,6 @@ extra["compilerModules"] = arrayOf( ":compiler:frontend", ":compiler:frontend.common", ":compiler:frontend.java", - ":compiler:frontend.script", ":compiler:cli-common", ":compiler:daemon-common", ":compiler:daemon", diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts index c9e1c5693b7..9fca7fee24a 100644 --- a/compiler/cli/build.gradle.kts +++ b/compiler/cli/build.gradle.kts @@ -10,7 +10,6 @@ dependencies { compile(project(":compiler:cli-common")) compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) compile(project(":compiler:backend-common")) compile(project(":compiler:backend")) compile(project(":compiler:backend.jvm")) diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts index 7c97ed609c7..e8c39c71c69 100644 --- a/compiler/cli/cli-common/build.gradle.kts +++ b/compiler/cli/cli-common/build.gradle.kts @@ -8,7 +8,6 @@ dependencies { compile(project(":core:util.runtime")) compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) compileOnly(project(":kotlin-reflect-api")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) } diff --git a/compiler/frontend.script/build.gradle.kts b/compiler/frontend.script/build.gradle.kts deleted file mode 100644 index 81e06e6e4bf..00000000000 --- a/compiler/frontend.script/build.gradle.kts +++ /dev/null @@ -1,20 +0,0 @@ - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - compile(project(":compiler:util")) - compile(project(":compiler:frontend")) - compile(kotlinStdlib()) - compileOnly(project(":kotlin-reflect-api")) - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - runtimeOnly(project(":kotlin-reflect")) -} - -sourceSets { - "main" { projectDefault() } - "test" {} -} diff --git a/compiler/frontend.script/resources/META-INF/services/org.jetbrains.kotlin.script.ScriptHelper b/compiler/frontend.script/resources/META-INF/services/org.jetbrains.kotlin.script.ScriptHelper deleted file mode 100644 index 46ba58a3987..00000000000 --- a/compiler/frontend.script/resources/META-INF/services/org.jetbrains.kotlin.script.ScriptHelper +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.kotlin.script.ScriptHelperImpl diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index eb25d600204..fd89adcb36c 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -20,7 +20,6 @@ dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.common")) compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) compile(project(":compiler:ir.backend.common")) // TODO: fix import (workaround for jps build) compile(project(":js:js.frontend")) compile(project(":js:js.serializer")) diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index 70b584c00d4..52b7c60beeb 100644 --- a/idea/idea-core/build.gradle.kts +++ b/idea/idea-core/build.gradle.kts @@ -11,7 +11,6 @@ dependencies { compile(project(":core:descriptors.jvm")) compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) compile(project(":compiler:light-classes")) compile(project(":compiler:util")) compile(project(":idea:ide-common")) diff --git a/idea/idea-gradle-native/build.gradle.kts b/idea/idea-gradle-native/build.gradle.kts index e5016fe3e65..58b0de9ad6d 100644 --- a/idea/idea-gradle-native/build.gradle.kts +++ b/idea/idea-gradle-native/build.gradle.kts @@ -17,7 +17,6 @@ dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) compile(project(":js:js.frontend")) diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 614d3d4f458..e59735c82e9 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -12,7 +12,6 @@ dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) compile(project(":js:js.frontend")) diff --git a/idea/idea-test-framework/build.gradle.kts b/idea/idea-test-framework/build.gradle.kts index 2bce3162778..b85fcb29091 100644 --- a/idea/idea-test-framework/build.gradle.kts +++ b/idea/idea-test-framework/build.gradle.kts @@ -6,7 +6,6 @@ plugins { dependencies { testCompile(project(":compiler:frontend")) - testCompile(project(":compiler:frontend.script")) testCompile(projectTests(":compiler:tests-common")) testCompile(project(":idea")) testCompile(project(":idea:idea-jvm")) diff --git a/nj2k/nj2k-services/build.gradle.kts b/nj2k/nj2k-services/build.gradle.kts index 5eeb55ee04f..fcd9ca7f5ba 100644 --- a/nj2k/nj2k-services/build.gradle.kts +++ b/nj2k/nj2k-services/build.gradle.kts @@ -15,7 +15,6 @@ dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.common")) compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) compile(project(":js:js.frontend")) compile(project(":js:js.serializer")) compile(project(":compiler:light-classes")) diff --git a/plugins/scripting/scripting-compiler-impl/build.gradle.kts b/plugins/scripting/scripting-compiler-impl/build.gradle.kts index 54916f661ce..d0e6b11451d 100644 --- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-impl/build.gradle.kts @@ -9,7 +9,6 @@ plugins { dependencies { compileOnly(project(":compiler:frontend")) compileOnly(project(":compiler:frontend.java")) - compileOnly(project(":compiler:frontend.script")) compileOnly(project(":compiler:psi")) compileOnly(project(":compiler:plugin-api")) compileOnly(project(":compiler:cli")) @@ -38,8 +37,6 @@ sourceSets { tasks.withType> { kotlinOptions { - languageVersion = "1.2" - apiVersion = "1.2" freeCompilerArgs += "-Xskip-metadata-version-check" } } diff --git a/plugins/scripting/scripting-compiler/build.gradle.kts b/plugins/scripting/scripting-compiler/build.gradle.kts index 614940c6636..313c35a7b84 100644 --- a/plugins/scripting/scripting-compiler/build.gradle.kts +++ b/plugins/scripting/scripting-compiler/build.gradle.kts @@ -21,7 +21,6 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompile(project(":compiler:frontend")) - testCompile(project(":compiler:frontend.script")) testCompile(project(":compiler:plugin-api")) testCompile(project(":compiler:util")) testCompile(project(":compiler:cli")) diff --git a/plugins/source-sections/source-sections-compiler/build.gradle.kts b/plugins/source-sections/source-sections-compiler/build.gradle.kts index 0dc68f97000..cc64e2f8c89 100644 --- a/plugins/source-sections/source-sections-compiler/build.gradle.kts +++ b/plugins/source-sections/source-sections-compiler/build.gradle.kts @@ -9,12 +9,10 @@ plugins { dependencies { compileOnly(project(":compiler:frontend")) - compileOnly(project(":compiler:frontend.script")) compileOnly(project(":compiler:plugin-api")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompile(project(":compiler:frontend")) - testCompile(project(":compiler:frontend.script")) testCompile(project(":compiler:plugin-api")) testCompile(project(":compiler:util")) testCompile(project(":compiler:cli")) diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index dae9023bc51..9177ea4377b 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -46,7 +46,6 @@ val projectsToShadow by extra(listOf( ":compiler:frontend", ":compiler:frontend.common", ":compiler:frontend.java", - ":compiler:frontend.script", ":idea:ide-common", ":idea", ":idea:idea-native", diff --git a/settings.gradle b/settings.gradle index cd5691b6a6c..58e498d7dd2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -38,7 +38,6 @@ include ":kotlin-build-common", ":compiler:frontend", ":compiler:frontend.common", ":compiler:frontend.java", - ":compiler:frontend.script", ":kotlin-compiler-runner", ":compiler:cli-common", ":compiler:ir.tree",