Add config params for specifying target annotations, import param renaming

This commit is contained in:
Ilya Chernikov
2018-03-28 16:50:06 +02:00
parent 191b1cfefa
commit 7fbcfdf09e
3 changed files with 7 additions and 3 deletions
@@ -30,7 +30,7 @@ abstract class MyScriptWithMavenDeps {
val myJvmConfigParams = jvmJavaHomeParams + with(ScriptCompileConfigurationProperties) {
listOf(
baseClass<MyScriptWithMavenDeps>(),
importedPackages(DependsOn::class.qualifiedName!!, Repository::class.qualifiedName!!),
defaultImports(DependsOn::class.qualifiedName!!, Repository::class.qualifiedName!!),
dependencies(
JvmDependency(
scriptCompilationClasspathFromContext(
@@ -23,7 +23,7 @@ object ScriptCompileConfigurationProperties {
val contextVariables by typedKey<Map<String, KType>>() // external variables
val importedPackages by typedKey<List<String>>()
val defaultImports by typedKey<List<String>>()
val restrictions by typedKey<List<ResolvingRestrictionRule>>()
@@ -31,6 +31,10 @@ object ScriptCompileConfigurationProperties {
val dependencies by typedKey<List<ScriptDependency>>()
val generatedClassAnnotations by typedKey<List<KClass<out Annotation>>>()
val generatedMethodAnnotations by typedKey<List<KClass<out Annotation>>>()
val compilerOptions by typedKey<List<String>>() // Q: CommonCompilerOptions instead?
val refineBeforeParsing by typedKey<Boolean>() // default: false
@@ -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