Fix 'kotlin-spring' and 'kotlin-noarg' Gradle plugin importing (KT-17049)
Allopen and Noarg plugins now use 'presets' that should be handled in the Gradle importer as well.
This commit is contained in:
committed by
Yan Zhulanow
parent
9fa16364e1
commit
21da11fe18
+3
-1
@@ -42,6 +42,7 @@ class AllOpenGradleSubplugin : Plugin<Project> {
|
||||
|
||||
project.afterEvaluate {
|
||||
val fqNamesAsString = allOpenExtension.myAnnotations.joinToString(",")
|
||||
val presetsAsString = allOpenExtension.myPresets.joinToString(",")
|
||||
project.extensions.extraProperties.set("kotlinAllOpenAnnotations", fqNamesAsString)
|
||||
|
||||
val allBuildscriptArtifacts = project.getBuildscriptArtifacts() + project.rootProject.getBuildscriptArtifacts()
|
||||
@@ -54,7 +55,8 @@ class AllOpenGradleSubplugin : Plugin<Project> {
|
||||
open class TaskForAllOpen : AbstractTask()
|
||||
project.tasks.add(project.tasks.create("allOpenDataStorageTask", TaskForAllOpen::class.java).apply {
|
||||
isEnabled = false
|
||||
description = "Supported annotations: " + fqNamesAsString +
|
||||
description = "Supported annotations: $fqNamesAsString" +
|
||||
"; Presets: $presetsAsString" +
|
||||
"; Compiler plugin classpath: $allOpenCompilerPluginFile"
|
||||
})
|
||||
}
|
||||
|
||||
+2
@@ -43,6 +43,7 @@ class NoArgGradleSubplugin : Plugin<Project> {
|
||||
|
||||
project.afterEvaluate {
|
||||
val fqNamesAsString = noArgExtension.myAnnotations.joinToString(",")
|
||||
val presetsAsString = noArgExtension.myPresets.joinToString(",")
|
||||
project.extensions.extraProperties.set("kotlinNoArgAnnotations", fqNamesAsString)
|
||||
|
||||
val allBuildscriptArtifacts = project.getBuildscriptArtifacts() + project.rootProject.getBuildscriptArtifacts()
|
||||
@@ -56,6 +57,7 @@ class NoArgGradleSubplugin : Plugin<Project> {
|
||||
project.tasks.add(project.tasks.create("noArgDataStorageTask", TaskForNoArg::class.java).apply {
|
||||
isEnabled = false
|
||||
description = "Supported annotations: " + fqNamesAsString +
|
||||
"; Presets: $presetsAsString" +
|
||||
"; Compiler plugin classpath: $noArgCompilerPluginFile"
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user