From 2c3a50e4b39744f16db0f9db7dd99505b76c45cf Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Fri, 23 Mar 2018 16:08:22 +0100
Subject: [PATCH] Refactor scripting examples:

- split into script def and host part
- remove bad dependencies
- organize it in a way that should be typical for user scenarios
---
 .../scripting/jvm-maven-deps/build.gradle.kts |  1 -
 .../jvm-maven-deps/host/build.gradle.kts      |  1 +
 .../examples/jvm/resolve/maven/host/host.kt   | 48 ++++++++++
 .../jvm/resolve/maven/test/resolveTest.kt     |  2 +-
 .../testData/hello-maven-resolve-error.kts    |  0
 .../testData/hello-maven-resolve-junit.kts    |  0
 .../testData/hello-unresolved-junit.kts       |  0
 .../jvm-maven-deps/script/build.gradle.kts    |  1 +
 ...es.jvm.resolve.maven.MyScriptWithMavenDeps |  0
 .../examples/jvm/resolve/maven/scriptDef.kt}  | 88 ++++++-------------
 .../examples/jvm/resolve/maven/scriptDef.kt   | 19 ----
 .../jvm-simple-script/build.gradle.kts        |  1 -
 .../jvm-simple-script/host/build.gradle.kts   |  1 +
 .../script/examples/jvm/simple/host}/host.kt  | 21 ++---
 .../examples/jvm/simple/test/simpleTest.kt    |  2 +-
 .../{ => host}/testData/error.kts             |  0
 .../{ => host}/testData/hello.kts             |  0
 .../jvm-simple-script/script/build.gradle.kts |  1 +
 ...kotlin.script.examples.jvm.simple.MyScript |  0
 .../script/examples/jvm/simple/scriptDef.kt   |  0
 libraries/scripting/jvm-host/build.gradle.kts |  1 +
 settings.gradle                               | 12 ++-
 22 files changed, 97 insertions(+), 102 deletions(-)
 delete mode 100644 libraries/examples/scripting/jvm-maven-deps/build.gradle.kts
 create mode 100644 libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
 create mode 100644 libraries/examples/scripting/jvm-maven-deps/host/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host/host.kt
 rename libraries/examples/scripting/jvm-maven-deps/{ => host}/test/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt (96%)
 rename libraries/examples/scripting/jvm-maven-deps/{ => host}/testData/hello-maven-resolve-error.kts (100%)
 rename libraries/examples/scripting/jvm-maven-deps/{ => host}/testData/hello-maven-resolve-junit.kts (100%)
 rename libraries/examples/scripting/jvm-maven-deps/{ => host}/testData/hello-unresolved-junit.kts (100%)
 create mode 100644 libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts
 rename libraries/examples/scripting/jvm-maven-deps/{ => script}/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.script.examples.jvm.resolve.maven.MyScriptWithMavenDeps (100%)
 rename libraries/examples/scripting/jvm-maven-deps/{src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host.kt => script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt} (60%)
 delete mode 100644 libraries/examples/scripting/jvm-maven-deps/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt
 delete mode 100644 libraries/examples/scripting/jvm-simple-script/build.gradle.kts
 create mode 100644 libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
 rename libraries/examples/scripting/jvm-simple-script/{src/org/jetbrains/kotlin/script/examples/jvm/simple => host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host}/host.kt (70%)
 rename libraries/examples/scripting/jvm-simple-script/{ => host}/test/org/jetbrains/kotlin/script/examples/jvm/simple/test/simpleTest.kt (94%)
 rename libraries/examples/scripting/jvm-simple-script/{ => host}/testData/error.kts (100%)
 rename libraries/examples/scripting/jvm-simple-script/{ => host}/testData/hello.kts (100%)
 create mode 100644 libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts
 create mode 100644 libraries/examples/scripting/jvm-simple-script/script/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.script.examples.jvm.simple.MyScript
 rename libraries/examples/scripting/jvm-simple-script/{ => script}/src/org/jetbrains/kotlin/script/examples/jvm/simple/scriptDef.kt (100%)

diff --git a/libraries/examples/scripting/jvm-maven-deps/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/build.gradle.kts
deleted file mode 100644
index a87d58dfd71..00000000000
--- a/libraries/examples/scripting/jvm-maven-deps/build.gradle.kts
+++ /dev/null
@@ -1 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.Coroutines

apply {
    plugin("kotlin")
}

dependencies {
    compile(project(":kotlin-script-runtime"))
    compile(project(":kotlin-scripting-jvm-host"))
    compile(project(":kotlin-script-util"))
    compile(projectDist(":kotlin-stdlib"))
    compile(projectDist(":kotlin-reflect"))
    compileOnly(project(":compiler:util"))
    runtime(projectDist(":kotlin-compiler"))
    testCompile(commonDep("junit"))
    testRuntime("com.jcabi:jcabi-aether:0.10.1")
    testRuntime("org.sonatype.aether:aether-api:1.13.1")
    testRuntime("org.apache.maven:maven-core:3.0.3")
}

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/host/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
new file mode 100644
index 00000000000..5db79930a46
--- /dev/null
+++ b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
@@ -0,0 +1 @@
+import org.jetbrains.kotlin.gradle.dsl.Coroutines

apply {
    plugin("kotlin")
}

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
diff --git a/libraries/examples/scripting/jvm-maven-deps/host/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host/host.kt b/libraries/examples/scripting/jvm-maven-deps/host/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host/host.kt
new file mode 100644
index 00000000000..3160e0e1861
--- /dev/null
+++ b/libraries/examples/scripting/jvm-maven-deps/host/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host/host.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.script.examples.jvm.resolve.maven.host
+
+import org.jetbrains.kotlin.script.examples.jvm.resolve.maven.MyScriptWithMavenDeps
+import org.jetbrains.kotlin.script.examples.jvm.resolve.maven.myJvmConfig
+import java.io.File
+import kotlin.script.experimental.api.EvaluationResult
+import kotlin.script.experimental.api.ResultWithDiagnostics
+import kotlin.script.experimental.api.ScriptEvaluationEnvironment
+import kotlin.script.experimental.api.toConfigEntry
+import kotlin.script.experimental.definitions.ScriptDefinitionFromAnnotatedBaseClass
+import kotlin.script.experimental.host.toScriptSource
+import kotlin.script.experimental.jvm.DummyCompiledJvmScriptCache
+import kotlin.script.experimental.jvm.JvmBasicScriptingHost
+import kotlin.script.experimental.jvm.JvmScriptCompiler
+import kotlin.script.experimental.jvmhost.impl.KJVMCompilerImpl
+
+fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
+    val scriptCompiler = JvmScriptCompiler(KJVMCompilerImpl(), DummyCompiledJvmScriptCache())
+    val scriptDefinition = ScriptDefinitionFromAnnotatedBaseClass(MyScriptWithMavenDeps::class)
+
+    val host = JvmBasicScriptingHost(
+        scriptDefinition.configurator,
+        scriptCompiler,
+        scriptDefinition.runner
+    )
+
+    return host.eval(myJvmConfig { add(scriptFile.toScriptSource().toConfigEntry()) }, ScriptEvaluationEnvironment())
+}
+
+fun main(vararg args: String) {
+    if (args.size != 1) {
+        println("usage: <app> <script file>")
+    } else {
+        val scriptFile = File(args[0])
+        println("Executing script $scriptFile")
+
+        val res = evalFile(scriptFile)
+
+        res.reports.forEach {
+            println(" : ${it.message}" + if (it.exception == null) "" else ": ${it.exception}")
+        }
+    }
+}
diff --git a/libraries/examples/scripting/jvm-maven-deps/test/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt b/libraries/examples/scripting/jvm-maven-deps/host/test/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt
similarity index 96%
rename from libraries/examples/scripting/jvm-maven-deps/test/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt
rename to libraries/examples/scripting/jvm-maven-deps/host/test/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt
index a7512066c81..2350c5fb511 100644
--- a/libraries/examples/scripting/jvm-maven-deps/test/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt
+++ b/libraries/examples/scripting/jvm-maven-deps/host/test/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt
@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.script.examples.jvm.resolve.maven.test
 
-import org.jetbrains.kotlin.script.examples.jvm.resolve.maven.evalFile
+import org.jetbrains.kotlin.script.examples.jvm.resolve.maven.host.evalFile
 import org.junit.Assert
 import org.junit.Test
 import java.io.File
diff --git a/libraries/examples/scripting/jvm-maven-deps/testData/hello-maven-resolve-error.kts b/libraries/examples/scripting/jvm-maven-deps/host/testData/hello-maven-resolve-error.kts
similarity index 100%
rename from libraries/examples/scripting/jvm-maven-deps/testData/hello-maven-resolve-error.kts
rename to libraries/examples/scripting/jvm-maven-deps/host/testData/hello-maven-resolve-error.kts
diff --git a/libraries/examples/scripting/jvm-maven-deps/testData/hello-maven-resolve-junit.kts b/libraries/examples/scripting/jvm-maven-deps/host/testData/hello-maven-resolve-junit.kts
similarity index 100%
rename from libraries/examples/scripting/jvm-maven-deps/testData/hello-maven-resolve-junit.kts
rename to libraries/examples/scripting/jvm-maven-deps/host/testData/hello-maven-resolve-junit.kts
diff --git a/libraries/examples/scripting/jvm-maven-deps/testData/hello-unresolved-junit.kts b/libraries/examples/scripting/jvm-maven-deps/host/testData/hello-unresolved-junit.kts
similarity index 100%
rename from libraries/examples/scripting/jvm-maven-deps/testData/hello-unresolved-junit.kts
rename to libraries/examples/scripting/jvm-maven-deps/host/testData/hello-unresolved-junit.kts
diff --git a/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts
new file mode 100644
index 00000000000..d422f40f156
--- /dev/null
+++ b/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts
@@ -0,0 +1 @@
+
apply {
    plugin("kotlin")
}

dependencies {
    compile(project(":kotlin-scripting-jvm"))
    compile(project(":kotlin-script-util"))
    runtime("com.jcabi:jcabi-aether:0.10.1")
    runtime("org.sonatype.aether:aether-api:1.13.1")
    runtime("org.apache.maven:maven-core:3.0.3")
}

sourceSets {
    "main" { projectDefault() }
    "test" { }
}

\ No newline at end of file
diff --git a/libraries/examples/scripting/jvm-maven-deps/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.script.examples.jvm.resolve.maven.MyScriptWithMavenDeps b/libraries/examples/scripting/jvm-maven-deps/script/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.script.examples.jvm.resolve.maven.MyScriptWithMavenDeps
similarity index 100%
rename from libraries/examples/scripting/jvm-maven-deps/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.script.examples.jvm.resolve.maven.MyScriptWithMavenDeps
rename to libraries/examples/scripting/jvm-maven-deps/script/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.script.examples.jvm.resolve.maven.MyScriptWithMavenDeps
diff --git a/libraries/examples/scripting/jvm-maven-deps/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host.kt b/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt
similarity index 60%
rename from libraries/examples/scripting/jvm-maven-deps/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host.kt
rename to libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt
index e8a7bb97e14..a3d1b2855de 100644
--- a/libraries/examples/scripting/jvm-maven-deps/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host.kt
+++ b/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt
@@ -1,35 +1,47 @@
 /*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
  * that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.script.examples.jvm.resolve.maven
 
-import org.jetbrains.kotlin.script.util.*
-import org.jetbrains.kotlin.script.util.impl.getResourcePathForClass
+import org.jetbrains.kotlin.script.util.DependsOn
+import org.jetbrains.kotlin.script.util.FilesAndMavenResolver
+import org.jetbrains.kotlin.script.util.Repository
+import org.jetbrains.kotlin.script.util.scriptCompilationClasspathFromContext
 import java.io.File
 import kotlin.reflect.KClass
 import kotlin.script.dependencies.ScriptContents
 import kotlin.script.dependencies.ScriptDependenciesResolver
+import kotlin.script.experimental.annotations.KotlinScript
 import kotlin.script.experimental.api.*
-import kotlin.script.experimental.definitions.ScriptDefinitionFromAnnotatedBaseClass
-import kotlin.script.experimental.host.toScriptSource
+import kotlin.script.experimental.basic.DefaultScriptSelector
 import kotlin.script.experimental.jvm.*
-import kotlin.script.experimental.jvmhost.impl.KJVMCompilerImpl
+import kotlin.script.experimental.jvm.runners.BasicJvmScriptRunner
 
-val stdlibFile: File by lazy {
-    KotlinJars.stdlib
-            ?: throw Exception("Unable to find kotlin stdlib, please specify it explicitly via \"kotlin.java.stdlib.jar\" property")
+@KotlinScript(
+    DefaultScriptSelector::class,
+    MyConfigurator::class,
+    BasicJvmScriptRunner::class
+)
+abstract class MyScriptWithMavenDeps {
+//    abstract fun body(vararg args: String): Int
 }
 
-val selfFile: File by lazy {
-    getResourcePathForClass(MyScriptWithMavenDeps::class.java).takeIf(File::exists)
-            ?: throw Exception("Unable to get path to the script base")
-}
-
-val scriptUtilsJarFile: File by lazy {
-    getResourcePathForClass(DependsOn::class.java).takeIf(File::exists)
-            ?: throw Exception("Unable to get path to the kotlin-script-util.jar")
+inline fun myJvmConfig(
+    from: HeterogeneousMap = HeterogeneousMap(),
+    crossinline body: JvmScriptCompileConfigurationParams.Builder.() -> Unit = {}
+) = jvmConfigWithJavaHome(from) {
+    signature<MyScriptWithMavenDeps>()
+    ScriptCompileConfigurationParams.importedPackages(listOf(DependsOn::class.qualifiedName!!, Repository::class.qualifiedName!!))
+    dependencies(
+        scriptCompilationClasspathFromContext(
+            "script", // script library jar name
+            "kotlin-script-util" // DependsOn annotation is taken from script-util
+        )
+    )
+    ScriptCompileConfigurationParams.updateConfigurationOnAnnotations(listOf(DependsOn::class, Repository::class))
+    body()
 }
 
 class MyConfigurator(val baseClass: KClass<Any>? = null) : ScriptConfigurator {
@@ -69,45 +81,3 @@ class MyConfigurator(val baseClass: KClass<Any>? = null) : ScriptConfigurator {
     }
 }
 
-inline fun myJvmConfig(
-    from: HeterogeneousMap = HeterogeneousMap(),
-    crossinline body: JvmScriptCompileConfigurationParams.Builder.() -> Unit = {}
-) = jvmConfigWithJavaHome(from) {
-    signature<MyScriptWithMavenDeps>()
-    ScriptCompileConfigurationParams.importedPackages(listOf(DependsOn::class.qualifiedName!!, Repository::class.qualifiedName!!))
-    dependencies(
-        listOf(stdlibFile),
-        listOf(selfFile),
-        listOf(scriptUtilsJarFile)
-    )
-    ScriptCompileConfigurationParams.updateConfigurationOnAnnotations(listOf(DependsOn::class, Repository::class))
-    body()
-}
-
-fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
-    val scriptCompiler = JvmScriptCompiler(KJVMCompilerImpl(), DummyCompiledJvmScriptCache())
-    val scriptDefinition = ScriptDefinitionFromAnnotatedBaseClass(MyScriptWithMavenDeps::class)
-
-    val host = JvmBasicScriptingHost(
-        scriptDefinition.configurator,
-        scriptCompiler,
-        scriptDefinition.runner
-    )
-
-    return host.eval(myJvmConfig { add(scriptFile.toScriptSource().toConfigEntry()) }, ScriptEvaluationEnvironment())
-}
-
-fun main(vararg args: String) {
-    if (args.size != 1) {
-        println("usage: <app> <script file>")
-    } else {
-        val scriptFile = File(args[0])
-        println("Executing script $scriptFile")
-
-        val res = evalFile(scriptFile)
-
-        res.reports.forEach {
-            println(" : ${it.message}" + if (it.exception == null) "" else ": ${it.exception}")
-        }
-    }
-}
diff --git a/libraries/examples/scripting/jvm-maven-deps/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt b/libraries/examples/scripting/jvm-maven-deps/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt
deleted file mode 100644
index 5a05d709afa..00000000000
--- a/libraries/examples/scripting/jvm-maven-deps/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.script.examples.jvm.resolve.maven
-
-import kotlin.script.experimental.annotations.KotlinScript
-import kotlin.script.experimental.basic.DefaultScriptSelector
-import kotlin.script.experimental.jvm.runners.BasicJvmScriptRunner
-
-@KotlinScript(
-    DefaultScriptSelector::class,
-    MyConfigurator::class,
-    BasicJvmScriptRunner::class
-)
-abstract class MyScriptWithMavenDeps {
-//    abstract fun body(vararg args: String): Int
-}
diff --git a/libraries/examples/scripting/jvm-simple-script/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/build.gradle.kts
deleted file mode 100644
index 4b6ee68a75e..00000000000
--- a/libraries/examples/scripting/jvm-simple-script/build.gradle.kts
+++ /dev/null
@@ -1 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.Coroutines

apply {
    plugin("kotlin")
}

dependencies {
    compile(project(":kotlin-script-runtime"))
    compile(project(":kotlin-scripting-jvm-host"))
    compile(project(":kotlin-script-util"))
    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-simple-script/host/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
new file mode 100644
index 00000000000..ad6c89b61de
--- /dev/null
+++ b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
@@ -0,0 +1 @@
+import org.jetbrains.kotlin.gradle.dsl.Coroutines

apply {
    plugin("kotlin")
}

dependencies {
    compile(project(":examples:scripting-jvm-simple-script:script"))
    compile(project(":kotlin-scripting-jvm-host"))
    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/src/org/jetbrains/kotlin/script/examples/jvm/simple/host.kt b/libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt
similarity index 70%
rename from libraries/examples/scripting/jvm-simple-script/src/org/jetbrains/kotlin/script/examples/jvm/simple/host.kt
rename to libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt
index 0da1fc3109c..e4bd999cd58 100644
--- a/libraries/examples/scripting/jvm-simple-script/src/org/jetbrains/kotlin/script/examples/jvm/simple/host.kt
+++ b/libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt
@@ -1,12 +1,12 @@
 /*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.script.examples.jvm.simple
+package org.jetbrains.kotlin.script.examples.jvm.simple.host
 
-import org.jetbrains.kotlin.script.util.KotlinJars
-import org.jetbrains.kotlin.utils.PathUtil
+import org.jetbrains.kotlin.script.examples.jvm.simple.MyScript
+import org.jetbrains.kotlin.script.util.*
 import java.io.File
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.definitions.ScriptDefinitionFromAnnotatedBaseClass
@@ -14,26 +14,15 @@ import kotlin.script.experimental.host.toScriptSource
 import kotlin.script.experimental.jvm.*
 import kotlin.script.experimental.jvmhost.impl.KJVMCompilerImpl
 
-val stdlibFile: File by lazy {
-    KotlinJars.stdlib
-            ?: throw Exception("Unable to find kotlin stdlib, please specify it explicitly via \"kotlin.java.stdlib.jar\" property")
-}
-
-val selfFile: File by lazy {
-    PathUtil.getResourcePathForClass(MyScript::class.java).takeIf(File::exists)
-            ?: throw Exception("Unable to get path to the script base")
-}
-
 inline fun myJvmConfig(
     from: HeterogeneousMap = HeterogeneousMap(),
     crossinline body: JvmScriptCompileConfigurationParams.Builder.() -> Unit = {}
 ) = jvmConfigWithJavaHome(from) {
     signature<MyScript>()
-    dependencies(listOf(stdlibFile), listOf(selfFile))
+    dependencies(scriptCompilationClasspathFromContext("script" /* script library jar name */))
     body()
 }
 
-
 fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
     val scriptCompiler = JvmScriptCompiler(KJVMCompilerImpl(), DummyCompiledJvmScriptCache())
     val scriptDefinition = ScriptDefinitionFromAnnotatedBaseClass(MyScript::class)
diff --git a/libraries/examples/scripting/jvm-simple-script/test/org/jetbrains/kotlin/script/examples/jvm/simple/test/simpleTest.kt b/libraries/examples/scripting/jvm-simple-script/host/test/org/jetbrains/kotlin/script/examples/jvm/simple/test/simpleTest.kt
similarity index 94%
rename from libraries/examples/scripting/jvm-simple-script/test/org/jetbrains/kotlin/script/examples/jvm/simple/test/simpleTest.kt
rename to libraries/examples/scripting/jvm-simple-script/host/test/org/jetbrains/kotlin/script/examples/jvm/simple/test/simpleTest.kt
index c67db1d1b9f..d4e1ac8bb76 100644
--- a/libraries/examples/scripting/jvm-simple-script/test/org/jetbrains/kotlin/script/examples/jvm/simple/test/simpleTest.kt
+++ b/libraries/examples/scripting/jvm-simple-script/host/test/org/jetbrains/kotlin/script/examples/jvm/simple/test/simpleTest.kt
@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.script.examples.jvm.simple.test
 
-import org.jetbrains.kotlin.script.examples.jvm.simple.evalFile
+import org.jetbrains.kotlin.script.examples.jvm.simple.host.evalFile
 import org.junit.Assert
 import java.io.File
 import org.junit.Test
diff --git a/libraries/examples/scripting/jvm-simple-script/testData/error.kts b/libraries/examples/scripting/jvm-simple-script/host/testData/error.kts
similarity index 100%
rename from libraries/examples/scripting/jvm-simple-script/testData/error.kts
rename to libraries/examples/scripting/jvm-simple-script/host/testData/error.kts
diff --git a/libraries/examples/scripting/jvm-simple-script/testData/hello.kts b/libraries/examples/scripting/jvm-simple-script/host/testData/hello.kts
similarity index 100%
rename from libraries/examples/scripting/jvm-simple-script/testData/hello.kts
rename to libraries/examples/scripting/jvm-simple-script/host/testData/hello.kts
diff --git a/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts
new file mode 100644
index 00000000000..808464cef13
--- /dev/null
+++ b/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts
@@ -0,0 +1 @@
+
apply {
    plugin("kotlin")
}

dependencies {
    compile(project(":kotlin-scripting-jvm"))
}

sourceSets {
    "main" { projectDefault() }
    "test" {}
}
\ No newline at end of file
diff --git a/libraries/examples/scripting/jvm-simple-script/script/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.script.examples.jvm.simple.MyScript b/libraries/examples/scripting/jvm-simple-script/script/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.script.examples.jvm.simple.MyScript
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/libraries/examples/scripting/jvm-simple-script/src/org/jetbrains/kotlin/script/examples/jvm/simple/scriptDef.kt b/libraries/examples/scripting/jvm-simple-script/script/src/org/jetbrains/kotlin/script/examples/jvm/simple/scriptDef.kt
similarity index 100%
rename from libraries/examples/scripting/jvm-simple-script/src/org/jetbrains/kotlin/script/examples/jvm/simple/scriptDef.kt
rename to libraries/examples/scripting/jvm-simple-script/script/src/org/jetbrains/kotlin/script/examples/jvm/simple/scriptDef.kt
diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts
index ba4640e293b..f7b38c47b8f 100644
--- a/libraries/scripting/jvm-host/build.gradle.kts
+++ b/libraries/scripting/jvm-host/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     compile(project(":kotlin-stdlib"))
     compile(project(":kotlin-scripting-common"))
     compile(project(":kotlin-scripting-jvm"))
+    compile(project(":kotlin-script-util"))
     compileOnly(project(":compiler:cli"))
     compileOnly(intellijCoreDep())
 }
diff --git a/settings.gradle b/settings.gradle
index b34eb020a5e..cc7b7cbb933 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -156,8 +156,10 @@ include ":kotlin-build-common",
         ":kotlin-scripting-compiler",
         ":kotlin-scripting-idea",
         ":kotlin-scripting-gradle",
-        ":examples:scripting-jvm-simple-script",
-        ":examples:scripting-jvm-maven-deps",
+        ":examples:scripting-jvm-simple-script:script",
+        ":examples:scripting-jvm-simple-script:host",
+        ":examples:scripting-jvm-maven-deps:script",
+        ":examples:scripting-jvm-maven-deps:host",
         ":pill:generate-all-tests",
         ":include:kotlin-compiler",
 
@@ -258,8 +260,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').projectDir = "$rootDir/libraries/examples/scripting/jvm-simple-script" as File
-project(':examples:scripting-jvm-maven-deps').projectDir = "$rootDir/libraries/examples/scripting/jvm-maven-deps" 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(':pill:generate-all-tests').projectDir = "$rootDir/plugins/pill/generate-all-tests" as File
 
 // plugin markers: