azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor main-kts build scripts - fix red code in IDEA

Browse Source
This commit is contained in:
Ilya Chernikov
2019-07-24 19:20:45 +02:00
parent 42dde50b6b
commit 5fe843d754
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-main-kts-test/build.gradle.kts
+1 -1
View File
@@ -8,7 +8,7 @@ plugins {
dependencies {
testCompile(project(":kotlin-main-kts"))
testCompileOnly(project(":compiler:cli"))
testCompile(project(":kotlin-scripting-jvm-host-embeddable"))
testCompileOnly(project(":kotlin-scripting-jvm-host"))
testCompile(commonDep("junit"))
testCompile(projectTests(":kotlin-scripting-compiler")) { isTransitive = false }
}
libraries/tools/kotlin-main-kts/build.gradle.kts
+9 -13
View File
@@ -12,26 +12,22 @@ val jarBaseName = property("archivesBaseName") as String
val proguardLibraryJars by configurations.creating
val projectsDependencies = listOf(
":kotlin-scripting-common",
":kotlin-scripting-jvm",
":kotlin-scripting-jvm-host",
":kotlin-script-util",
":kotlin-script-runtime"
)
dependencies {
projectsDependencies.forEach {
compileOnly(project(it))
embedded(project(it)) { isTransitive = false }
testCompile(project(it))
}
compileOnly("org.apache.ivy:ivy:2.4.0")
compileOnly(project(":compiler:cli-common"))
compileOnly(project(":kotlin-scripting-jvm-host"))
compileOnly(project(":kotlin-script-util"))
testCompile(project(":kotlin-scripting-jvm-host"))
testCompile(project(":kotlin-script-util"))
runtime(project(":kotlin-compiler-embeddable"))
runtime(project(":kotlin-scripting-compiler-embeddable"))
runtime(project(":kotlin-scripting-jvm-host-embeddable"))
runtime(project(":kotlin-reflect"))
embedded(project(":kotlin-scripting-common")) { isTransitive = false }
embedded(project(":kotlin-scripting-jvm")) { isTransitive = false }
embedded(project(":kotlin-scripting-jvm-host")) { isTransitive = false }
embedded(project(":kotlin-script-util")) { isTransitive = false }
embedded(project(":kotlin-script-runtime")) { isTransitive = false }
embedded("org.apache.ivy:ivy:2.4.0")
embedded(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
proguardLibraryJars(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar"),