Merge scripting-impl to scripting-compiler-impl module...

to continue merging with the branch with further scripting refactorings
This commit is contained in:
Ilya Chernikov
2019-04-11 16:58:28 +02:00
parent a82b386d81
commit 199b32cad7
30 changed files with 17 additions and 67 deletions
+1 -1
View File
@@ -90,7 +90,7 @@ dependencies {
testRuntime(project(":kotlin-noarg-compiler-plugin"))
testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false }
testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false }
testRuntime(project(":kotlin-scripting-impl"))
testRuntime(project(":kotlin-scripting-compiler-impl"))
testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false }
testRuntime(project(":kotlinx-serialization-compiler-plugin"))
testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false }
+1 -1
View File
@@ -17,7 +17,7 @@ dependencies {
compile(project(":idea:ide-common"))
compile(project(":idea:idea-jps-common"))
compile(project(":plugins:android-extensions-compiler"))
compile(project(":kotlin-scripting-impl"))
compile(project(":kotlin-scripting-compiler-impl"))
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }