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

Gradle: Use copyable user data for compiler plugin options

Browse Source 
#KT-22227 Fixed
This commit is contained in:
Alexey Sedunov
2018-01-11 15:45:26 +03:00
parent 5892944bfc
commit 05b618eec8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/annotation-based-compiler-plugins-ide-support/src/AbstractGradleImportHandler.kt
+1 -1
View File
@@ -54,7 +54,7 @@ abstract class AbstractGradleImportHandler<T : AnnotationBasedPluginModel> : Gra
private fun getPluginSetupByModule( private fun getPluginSetupByModule(
moduleNode: DataNode<ModuleData> moduleNode: DataNode<ModuleData>
): AnnotationBasedCompilerPluginSetup? { ): AnnotationBasedCompilerPluginSetup? {
val pluginModel = moduleNode.getUserData(modelKey)?.takeIf { it.isEnabled } ?: return null val pluginModel = moduleNode.getCopyableUserData(modelKey)?.takeIf { it.isEnabled } ?: return null
val annotations = pluginModel.annotations val annotations = pluginModel.annotations
val presets = pluginModel.presets val presets = pluginModel.presets
plugins/annotation-based-compiler-plugins-ide-support/src/AnnotationBasedPluginProjectResolverExtension.kt
+1 -1
View File
@@ -56,7 +56,7 @@ abstract class AnnotationBasedPluginProjectResolverExtension<T : AnnotationBased
val model = resolverCtx.getExtraProject(gradleModule, modelClass) val model = resolverCtx.getExtraProject(gradleModule, modelClass)
if (model != null) { if (model != null) {
ideModule.putUserData(userDataKey, model) ideModule.putCopyableUserData(userDataKey, model)
} }
super.populateModuleExtraModels(gradleModule, ideModule) super.populateModuleExtraModels(gradleModule, ideModule)