From 599a9acce8fe8caf9604a3fa84973bd02898af16 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 29 Mar 2018 15:35:44 +0200 Subject: [PATCH] Rearrange scripting examples to conform the build system requirements --- .../jvm-maven-deps/host/build.gradle.kts | 2 +- .../examples/jvm/resolve/maven/scriptDef.kt | 2 +- .../jvm-simple-script/host/build.gradle.kts | 2 +- .../script/examples/jvm/simple/host/host.kt | 2 +- settings.gradle | 16 ++++++++-------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts index dd30ca90a36..55d6c8bf2d5 100644 --- a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts @@ -1 +1 @@ -import org.jetbrains.kotlin.gradle.dsl.Coroutines plugins { kotlin("jvm") } dependencies { compile(project(":examples:scripting-jvm-maven-deps:script")) compile(project(":kotlin-scripting-jvm-host")) compile(projectDist(":kotlin-stdlib")) compile(projectDist(":kotlin-reflect")) compileOnly(project(":compiler:util")) runtime(projectDist(":kotlin-compiler")) testCompile(commonDep("junit")) } sourceSets { "main" { projectDefault() } "test" { projectDefault() } } kotlin { experimental.coroutines = Coroutines.ENABLE } \ No newline at end of file +import org.jetbrains.kotlin.gradle.dsl.Coroutines plugins { kotlin("jvm") } dependencies { compile(project(":examples:scripting-jvm-maven-deps")) compile(project(":kotlin-scripting-jvm-host")) compile(projectDist(":kotlin-stdlib")) compile(projectDist(":kotlin-reflect")) compileOnly(project(":compiler:util")) runtime(projectDist(":kotlin-compiler")) testCompile(commonDep("junit")) } sourceSets { "main" { projectDefault() } "test" { projectDefault() } } kotlin { experimental.coroutines = Coroutines.ENABLE } \ No newline at end of file diff --git a/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt b/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt index 377286f75b3..355e3cf6196 100644 --- a/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt +++ b/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt @@ -34,7 +34,7 @@ val myJvmConfigParams = jvmJavaHomeParams + with(ScriptCompileConfigurationPrope dependencies( JvmDependency( scriptCompilationClasspathFromContext( - "script", // script library jar name + "scripting-jvm-maven-deps", // script library jar name "kotlin-script-util" // DependsOn annotation is taken from script-util ) ) diff --git a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts index 4986dedb9b8..50409b9367a 100644 --- a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts @@ -1 +1 @@ -import org.jetbrains.kotlin.gradle.dsl.Coroutines plugins { kotlin("jvm") } dependencies { compile(project(":examples:scripting-jvm-simple-script:script")) compile(project(":kotlin-scripting-jvm-host")) compile(project(":kotlin-scripting-misc")) compile(project(":kotlin-script-util")) runtime(projectDist(":kotlin-compiler")) testCompile(commonDep("junit")) } sourceSets { "main" { projectDefault() } "test" { projectDefault() } } kotlin { experimental.coroutines = Coroutines.ENABLE } \ No newline at end of file +import org.jetbrains.kotlin.gradle.dsl.Coroutines plugins { kotlin("jvm") } dependencies { compile(project(":examples:scripting-jvm-simple-script")) compile(project(":kotlin-scripting-jvm-host")) compile(project(":kotlin-scripting-misc")) compile(project(":kotlin-script-util")) runtime(projectDist(":kotlin-compiler")) testCompile(commonDep("junit")) } sourceSets { "main" { projectDefault() } "test" { projectDefault() } } kotlin { experimental.coroutines = Coroutines.ENABLE } \ No newline at end of file diff --git a/libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt b/libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt index 655e0ccaeff..30446a87128 100644 --- a/libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt +++ b/libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt @@ -18,7 +18,7 @@ import kotlin.script.experimental.misc.* val myJvmConfigParams = jvmJavaHomeParams + with(ScriptCompileConfigurationProperties) { listOf( baseClass(), - dependencies(JvmDependency(scriptCompilationClasspathFromContext("script" /* script library jar name */))) + dependencies(JvmDependency(scriptCompilationClasspathFromContext("scripting-jvm-simple-script" /* script library jar name */))) ) } diff --git a/settings.gradle b/settings.gradle index b7f7e2f13a4..e945140bb1f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -157,10 +157,10 @@ include ":kotlin-build-common", ":kotlin-scripting-compiler", ":kotlin-scripting-idea", ":kotlin-scripting-gradle", - ":examples:scripting-jvm-simple-script:script", - ":examples:scripting-jvm-simple-script:host", - ":examples:scripting-jvm-maven-deps:script", - ":examples:scripting-jvm-maven-deps:host", + ":examples:scripting-jvm-simple-script", + ":examples:scripting-jvm-simple-script-host", + ":examples:scripting-jvm-maven-deps", + ":examples:scripting-jvm-maven-deps-host", ":pill:generate-all-tests", ":include:kotlin-compiler", @@ -262,10 +262,10 @@ project(':kotlin-scripting-jvm-host').projectDir = "$rootDir/libraries/scripting project(':kotlin-scripting-compiler').projectDir = "$rootDir/plugins/scripting/scripting-cli" as File project(':kotlin-scripting-idea').projectDir = "$rootDir/plugins/scripting/scripting-idea" as File project(':kotlin-scripting-gradle').projectDir = "$rootDir/plugins/scripting/scripting-gradle" as File -project(':examples:scripting-jvm-simple-script:script').projectDir = "$rootDir/libraries/examples/scripting/jvm-simple-script/script" as File -project(':examples:scripting-jvm-simple-script:host').projectDir = "$rootDir/libraries/examples/scripting/jvm-simple-script/host" as File -project(':examples:scripting-jvm-maven-deps:script').projectDir = "$rootDir/libraries/examples/scripting/jvm-maven-deps/script" as File -project(':examples:scripting-jvm-maven-deps:host').projectDir = "$rootDir/libraries/examples/scripting/jvm-maven-deps/host" as File +project(':examples:scripting-jvm-simple-script').projectDir = "$rootDir/libraries/examples/scripting/jvm-simple-script/script" as File +project(':examples:scripting-jvm-simple-script-host').projectDir = "$rootDir/libraries/examples/scripting/jvm-simple-script/host" as File +project(':examples:scripting-jvm-maven-deps').projectDir = "$rootDir/libraries/examples/scripting/jvm-maven-deps/script" as File +project(':examples:scripting-jvm-maven-deps-host').projectDir = "$rootDir/libraries/examples/scripting/jvm-maven-deps/host" as File project(':pill:generate-all-tests').projectDir = "$rootDir/plugins/pill/generate-all-tests" as File // plugin markers: