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 5ad5841ddb1..377286f75b3 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 @@ -30,7 +30,7 @@ abstract class MyScriptWithMavenDeps { val myJvmConfigParams = jvmJavaHomeParams + with(ScriptCompileConfigurationProperties) { listOf( baseClass(), - importedPackages(DependsOn::class.qualifiedName!!, Repository::class.qualifiedName!!), + defaultImports(DependsOn::class.qualifiedName!!, Repository::class.qualifiedName!!), dependencies( JvmDependency( scriptCompilationClasspathFromContext( diff --git a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptConfigurationProperties.kt b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptConfigurationProperties.kt index ffb0594c1e5..9a8c269f288 100644 --- a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptConfigurationProperties.kt +++ b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptConfigurationProperties.kt @@ -23,7 +23,7 @@ object ScriptCompileConfigurationProperties { val contextVariables by typedKey>() // external variables - val importedPackages by typedKey>() + val defaultImports by typedKey>() val restrictions by typedKey>() @@ -31,6 +31,10 @@ object ScriptCompileConfigurationProperties { val dependencies by typedKey>() + val generatedClassAnnotations by typedKey>>() + + val generatedMethodAnnotations by typedKey>>() + val compilerOptions by typedKey>() // Q: CommonCompilerOptions instead? val refineBeforeParsing by typedKey() // default: false diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/BridgeDependenciesResolver.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/BridgeDependenciesResolver.kt index 6db95c20f8f..54a9e46c5bf 100644 --- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/BridgeDependenciesResolver.kt +++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/BridgeDependenciesResolver.kt @@ -66,7 +66,7 @@ class BridgeDependenciesResolver( DependenciesResolver.ResolveResult.Success( ScriptDependencies( classpath = newClasspath, // TODO: maybe it should return only increment from the initial config - imports = refinedConfiguration.getOrNull(ScriptCompileConfigurationProperties.importedPackages)?.toList() + imports = refinedConfiguration.getOrNull(ScriptCompileConfigurationProperties.defaultImports)?.toList() ?: emptyList() ), diagnostics