Skip to content

Commit

Permalink
Fix runtime dependencies for published scripting artifacts locally
Browse files Browse the repository at this point in the history
  • Loading branch information
ligee committed Aug 20, 2019
1 parent 6bd229c commit 60c84e3
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
9 changes: 9 additions & 0 deletions libraries/scripting/jsr223/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@

plugins {
maven
kotlin("jvm")
}

jvmTarget = "1.6"

val publishedRuntime by configurations.creating {
the<MavenPluginConvention>()
.conf2ScopeMappings
.addMapping(0, this, Conf2ScopeMappingContainer.RUNTIME)
}

dependencies {
compile(project(":kotlin-script-runtime"))
compile(kotlinStdlib())
Expand All @@ -15,6 +22,8 @@ dependencies {
compileOnly(project(":compiler:cli-common"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(intellijCoreDep())
publishedRuntime(project(":kotlin-compiler"))
publishedRuntime(project(":kotlin-reflect"))
}

sourceSets {
Expand Down
11 changes: 11 additions & 0 deletions libraries/scripting/jvm-host/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@

plugins {
maven
kotlin("jvm")
}

jvmTarget = "1.6"

val publishedRuntime by configurations.creating {
the<MavenPluginConvention>()
.conf2ScopeMappings
.addMapping(0, this, Conf2ScopeMappingContainer.RUNTIME)
}

dependencies {
compile(project(":kotlin-script-runtime"))
compile(kotlinStdlib())
Expand All @@ -14,6 +21,10 @@ dependencies {
compileOnly(project(":compiler:cli"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
publishedRuntime(project(":kotlin-compiler"))
publishedRuntime(project(":kotlin-scripting-compiler"))
publishedRuntime(project(":kotlin-reflect"))
publishedRuntime(commonDep("org.jetbrains.intellij.deps", "trove4j"))
}

sourceSets {
Expand Down

0 comments on commit 60c84e3

Please sign in to comment.