Drop refactored-out frontend.script module
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
|
|
||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||||
import org.gradle.plugins.ide.idea.model.IdeaModel
|
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.AbstractKotlinCompile
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||||
import proguard.gradle.ProGuardTask
|
import proguard.gradle.ProGuardTask
|
||||||
@@ -204,7 +203,6 @@ extra["compilerModules"] = arrayOf(
|
|||||||
":compiler:frontend",
|
":compiler:frontend",
|
||||||
":compiler:frontend.common",
|
":compiler:frontend.common",
|
||||||
":compiler:frontend.java",
|
":compiler:frontend.java",
|
||||||
":compiler:frontend.script",
|
|
||||||
":compiler:cli-common",
|
":compiler:cli-common",
|
||||||
":compiler:daemon-common",
|
":compiler:daemon-common",
|
||||||
":compiler:daemon",
|
":compiler:daemon",
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ dependencies {
|
|||||||
compile(project(":compiler:cli-common"))
|
compile(project(":compiler:cli-common"))
|
||||||
compile(project(":compiler:frontend"))
|
compile(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:frontend.java"))
|
compile(project(":compiler:frontend.java"))
|
||||||
compile(project(":compiler:frontend.script"))
|
|
||||||
compile(project(":compiler:backend-common"))
|
compile(project(":compiler:backend-common"))
|
||||||
compile(project(":compiler:backend"))
|
compile(project(":compiler:backend"))
|
||||||
compile(project(":compiler:backend.jvm"))
|
compile(project(":compiler:backend.jvm"))
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ dependencies {
|
|||||||
compile(project(":core:util.runtime"))
|
compile(project(":core:util.runtime"))
|
||||||
compile(project(":compiler:frontend"))
|
compile(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:frontend.java"))
|
compile(project(":compiler:frontend.java"))
|
||||||
compile(project(":compiler:frontend.script"))
|
|
||||||
compileOnly(project(":kotlin-reflect-api"))
|
compileOnly(project(":kotlin-reflect-api"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
||||||
|
|||||||
@@ -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" {}
|
|
||||||
}
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
org.jetbrains.kotlin.script.ScriptHelperImpl
|
|
||||||
@@ -20,7 +20,6 @@ dependencies {
|
|||||||
compile(project(":compiler:frontend"))
|
compile(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:frontend.common"))
|
compile(project(":compiler:frontend.common"))
|
||||||
compile(project(":compiler:frontend.java"))
|
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(":compiler:ir.backend.common")) // TODO: fix import (workaround for jps build)
|
||||||
compile(project(":js:js.frontend"))
|
compile(project(":js:js.frontend"))
|
||||||
compile(project(":js:js.serializer"))
|
compile(project(":js:js.serializer"))
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ dependencies {
|
|||||||
compile(project(":core:descriptors.jvm"))
|
compile(project(":core:descriptors.jvm"))
|
||||||
compile(project(":compiler:frontend"))
|
compile(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:frontend.java"))
|
compile(project(":compiler:frontend.java"))
|
||||||
compile(project(":compiler:frontend.script"))
|
|
||||||
compile(project(":compiler:light-classes"))
|
compile(project(":compiler:light-classes"))
|
||||||
compile(project(":compiler:util"))
|
compile(project(":compiler:util"))
|
||||||
compile(project(":idea:ide-common"))
|
compile(project(":idea:ide-common"))
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ dependencies {
|
|||||||
|
|
||||||
compile(project(":compiler:frontend"))
|
compile(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:frontend.java"))
|
compile(project(":compiler:frontend.java"))
|
||||||
compile(project(":compiler:frontend.script"))
|
|
||||||
|
|
||||||
compile(project(":js:js.frontend"))
|
compile(project(":js:js.frontend"))
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ dependencies {
|
|||||||
|
|
||||||
compile(project(":compiler:frontend"))
|
compile(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:frontend.java"))
|
compile(project(":compiler:frontend.java"))
|
||||||
compile(project(":compiler:frontend.script"))
|
|
||||||
|
|
||||||
compile(project(":js:js.frontend"))
|
compile(project(":js:js.frontend"))
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ plugins {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testCompile(project(":compiler:frontend"))
|
testCompile(project(":compiler:frontend"))
|
||||||
testCompile(project(":compiler:frontend.script"))
|
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testCompile(projectTests(":compiler:tests-common"))
|
||||||
testCompile(project(":idea"))
|
testCompile(project(":idea"))
|
||||||
testCompile(project(":idea:idea-jvm"))
|
testCompile(project(":idea:idea-jvm"))
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ dependencies {
|
|||||||
compile(project(":compiler:frontend"))
|
compile(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:frontend.common"))
|
compile(project(":compiler:frontend.common"))
|
||||||
compile(project(":compiler:frontend.java"))
|
compile(project(":compiler:frontend.java"))
|
||||||
compile(project(":compiler:frontend.script"))
|
|
||||||
compile(project(":js:js.frontend"))
|
compile(project(":js:js.frontend"))
|
||||||
compile(project(":js:js.serializer"))
|
compile(project(":js:js.serializer"))
|
||||||
compile(project(":compiler:light-classes"))
|
compile(project(":compiler:light-classes"))
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ plugins {
|
|||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(project(":compiler:frontend"))
|
compileOnly(project(":compiler:frontend"))
|
||||||
compileOnly(project(":compiler:frontend.java"))
|
compileOnly(project(":compiler:frontend.java"))
|
||||||
compileOnly(project(":compiler:frontend.script"))
|
|
||||||
compileOnly(project(":compiler:psi"))
|
compileOnly(project(":compiler:psi"))
|
||||||
compileOnly(project(":compiler:plugin-api"))
|
compileOnly(project(":compiler:plugin-api"))
|
||||||
compileOnly(project(":compiler:cli"))
|
compileOnly(project(":compiler:cli"))
|
||||||
@@ -38,8 +37,6 @@ sourceSets {
|
|||||||
|
|
||||||
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
|
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
languageVersion = "1.2"
|
|
||||||
apiVersion = "1.2"
|
|
||||||
freeCompilerArgs += "-Xskip-metadata-version-check"
|
freeCompilerArgs += "-Xskip-metadata-version-check"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ dependencies {
|
|||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
|
|
||||||
testCompile(project(":compiler:frontend"))
|
testCompile(project(":compiler:frontend"))
|
||||||
testCompile(project(":compiler:frontend.script"))
|
|
||||||
testCompile(project(":compiler:plugin-api"))
|
testCompile(project(":compiler:plugin-api"))
|
||||||
testCompile(project(":compiler:util"))
|
testCompile(project(":compiler:util"))
|
||||||
testCompile(project(":compiler:cli"))
|
testCompile(project(":compiler:cli"))
|
||||||
|
|||||||
@@ -9,12 +9,10 @@ plugins {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(project(":compiler:frontend"))
|
compileOnly(project(":compiler:frontend"))
|
||||||
compileOnly(project(":compiler:frontend.script"))
|
|
||||||
compileOnly(project(":compiler:plugin-api"))
|
compileOnly(project(":compiler:plugin-api"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
|
|
||||||
testCompile(project(":compiler:frontend"))
|
testCompile(project(":compiler:frontend"))
|
||||||
testCompile(project(":compiler:frontend.script"))
|
|
||||||
testCompile(project(":compiler:plugin-api"))
|
testCompile(project(":compiler:plugin-api"))
|
||||||
testCompile(project(":compiler:util"))
|
testCompile(project(":compiler:util"))
|
||||||
testCompile(project(":compiler:cli"))
|
testCompile(project(":compiler:cli"))
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ val projectsToShadow by extra(listOf(
|
|||||||
":compiler:frontend",
|
":compiler:frontend",
|
||||||
":compiler:frontend.common",
|
":compiler:frontend.common",
|
||||||
":compiler:frontend.java",
|
":compiler:frontend.java",
|
||||||
":compiler:frontend.script",
|
|
||||||
":idea:ide-common",
|
":idea:ide-common",
|
||||||
":idea",
|
":idea",
|
||||||
":idea:idea-native",
|
":idea:idea-native",
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ include ":kotlin-build-common",
|
|||||||
":compiler:frontend",
|
":compiler:frontend",
|
||||||
":compiler:frontend.common",
|
":compiler:frontend.common",
|
||||||
":compiler:frontend.java",
|
":compiler:frontend.java",
|
||||||
":compiler:frontend.script",
|
|
||||||
":kotlin-compiler-runner",
|
":kotlin-compiler-runner",
|
||||||
":compiler:cli-common",
|
":compiler:cli-common",
|
||||||
":compiler:ir.tree",
|
":compiler:ir.tree",
|
||||||
|
|||||||
Reference in New Issue
Block a user