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

Rearrange scripting examples to conform the build system requirements

Browse Source
This commit is contained in:
Ilya Chernikov
2018-03-29 15:35:44 +02:00
parent 7fbcfdf09e
commit 599a9acce8
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
+1 -1
View File
@@ -1 +1 @@
import org.jetbrains.kotlin.gradle.dsl.Coroutines import org.jetbrains.kotlin.gradle.dsl.Coroutines
libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt
+1 -1
View File
@@ -34,7 +34,7 @@ val myJvmConfigParams = jvmJavaHomeParams + with(ScriptCompileConfigurationPrope
dependencies( dependencies(
JvmDependency( JvmDependency(
scriptCompilationClasspathFromContext( scriptCompilationClasspathFromContext(
"script", // script library jar name "scripting-jvm-maven-deps", // script library jar name
"kotlin-script-util" // DependsOn annotation is taken from script-util "kotlin-script-util" // DependsOn annotation is taken from script-util
) )
) )
libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
+1 -1
View File
@@ -1 +1 @@
import org.jetbrains.kotlin.gradle.dsl.Coroutines import org.jetbrains.kotlin.gradle.dsl.Coroutines
libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt
+1 -1
View File
@@ -18,7 +18,7 @@ import kotlin.script.experimental.misc.*
val myJvmConfigParams = jvmJavaHomeParams + with(ScriptCompileConfigurationProperties) { val myJvmConfigParams = jvmJavaHomeParams + with(ScriptCompileConfigurationProperties) {
listOf( listOf(
baseClass<MyScript>(), baseClass<MyScript>(),
dependencies(JvmDependency(scriptCompilationClasspathFromContext("script" /* script library jar name */))) dependencies(JvmDependency(scriptCompilationClasspathFromContext("scripting-jvm-simple-script" /* script library jar name */)))
) )
} }
settings.gradle
+8 -8
View File
@@ -157,10 +157,10 @@ include ":kotlin-build-common",
":kotlin-scripting-compiler", ":kotlin-scripting-compiler",
":kotlin-scripting-idea", ":kotlin-scripting-idea",
":kotlin-scripting-gradle", ":kotlin-scripting-gradle",
":examples:scripting-jvm-simple-script:script", ":examples:scripting-jvm-simple-script",
":examples:scripting-jvm-simple-script:host", ":examples:scripting-jvm-simple-script-host",
":examples:scripting-jvm-maven-deps:script", ":examples:scripting-jvm-maven-deps",
":examples:scripting-jvm-maven-deps:host", ":examples:scripting-jvm-maven-deps-host",
":pill:generate-all-tests", ":pill:generate-all-tests",
":include:kotlin-compiler", ":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-compiler').projectDir = "$rootDir/plugins/scripting/scripting-cli" as File
project(':kotlin-scripting-idea').projectDir = "$rootDir/plugins/scripting/scripting-idea" 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(':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').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-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').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-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 project(':pill:generate-all-tests').projectDir = "$rootDir/plugins/pill/generate-all-tests" as File
// plugin markers: // plugin markers: