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 36ad216fac4..55ceba5a0ff 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 @@ -28,7 +28,7 @@ abstract class MyScriptWithMavenDeps { object MyConfiguration : ScriptingProperties() { init { include(jvmJavaHomeScriptingProperties) - ScriptDefinitionProperties { + scriptDefinition { defaultImports() defaultImports(Repository::class) jvmDependenciesFromCurrentContext( diff --git a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptConfiguration.kt b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptConfiguration.kt index 92f6d2b7542..d26cad682ef 100644 --- a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptConfiguration.kt +++ b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptConfiguration.kt @@ -17,6 +17,8 @@ object ScriptCompileConfigurationProperties : PropertiesGroup { val sourceFragments by typedKey>() } +val ScriptingProperties.compilationConfiguration get() = ScriptCompileConfigurationProperties + typealias ProcessedScriptData = ChainedPropertyBag object ProcessedScriptDataProperties : PropertiesGroup { diff --git a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptDefinition.kt b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptDefinition.kt index 95a32ef53ba..fcdc3502cf7 100644 --- a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptDefinition.kt +++ b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptDefinition.kt @@ -56,6 +56,7 @@ object ScriptDefinitionProperties : PropertiesGroup { // DSL -------------------- +val ScriptingProperties.scriptDefinition get() = ScriptDefinitionProperties @Suppress("MemberVisibilityCanBePrivate") class RefineConfigurationBuilder(props: ScriptingProperties) : PropertiesBuilder(props) { diff --git a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptingEnvironment.kt b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptingEnvironment.kt index 36dd2b80620..cb4ba40923a 100644 --- a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptingEnvironment.kt +++ b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptingEnvironment.kt @@ -25,6 +25,8 @@ object ScriptingEnvironmentProperties : PropertiesGroup { val getScriptingClass by typedKey() } +val ScriptingProperties.scriptingEnvironment get() = ScriptDefinitionProperties + interface GetScriptingClass { operator fun invoke(classType: KotlinType, contextClass: KClass<*>, environment: ScriptingEnvironment): KClass<*> } diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptData.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptData.kt index cd34b14ec66..6ba1b0e06f6 100644 --- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptData.kt +++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptData.kt @@ -10,12 +10,15 @@ package kotlin.script.experimental.jvm import java.io.File import kotlin.script.experimental.api.PropertiesGroup import kotlin.script.experimental.api.ScriptDependency +import kotlin.script.experimental.api.ScriptingProperties import kotlin.script.experimental.util.typedKey object JvmScriptCompileConfigurationProperties : PropertiesGroup { val javaHomeDir by typedKey() } +val ScriptingProperties.jvmCompileConfiguration get() = JvmScriptCompileConfigurationProperties + class JvmDependency(val classpath: List) : ScriptDependency { constructor(vararg classpathEntries: File) : this(classpathEntries.asList()) }