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

Resolve compiler plugin classpath using 'kotlinCompilerPluginClasspath' configuration

Browse Source 
#KT-24653 fixed
        #KT-24676 fixed
This commit is contained in:
Alexey Tsvetkov
2018-05-28 23:18:30 +03:00
parent 0c21b21a88
commit 873de17056
16 changed files with 94 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt
+6 -29
View File
@@ -23,7 +23,9 @@ import org.gradle.api.artifacts.ResolvedArtifact
import org.gradle.api.internal.ConventionTask
import org.gradle.api.tasks.SourceSet
import org.gradle.api.tasks.compile.AbstractCompile
import org.jetbrains.kotlin.gradle.plugin.JetBrainsSubpluginArtifact
import org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
class NoArgGradleSubplugin : Plugin<Project> {
@@ -35,39 +37,14 @@ class NoArgGradleSubplugin : Plugin<Project> {
}
}
fun Project.getBuildscriptArtifacts(): Set<ResolvedArtifact> =
buildscript.configurations.findByName("classpath")?.resolvedConfiguration?.resolvedArtifacts ?: emptySet()
override fun apply(project: Project) {
val noArgExtension = project.extensions.create("noArg", NoArgExtension::class.java)
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()
val noArgCompilerPluginFile = allBuildscriptArtifacts.filter {
val id = it.moduleVersion.id
id.group == NoArgKotlinGradleSubplugin.NOARG_GROUP_NAME
&& id.name == NoArgKotlinGradleSubplugin.NOARG_ARTIFACT_NAME
}.firstOrNull()?.file?.absolutePath ?: ""
open class TaskForNoArg : AbstractTask()
project.tasks.add(project.tasks.create("noArgDataStorageTask", TaskForNoArg::class.java).apply {
isEnabled = false
description = "Supported annotations: " + fqNamesAsString +
"; Presets: $presetsAsString" +
"; Compiler plugin classpath: $noArgCompilerPluginFile"
})
}
project.extensions.create("noArg", NoArgExtension::class.java)
}
}
class NoArgKotlinGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
companion object {
val NOARG_GROUP_NAME = "org.jetbrains.kotlin"
val NOARG_ARTIFACT_NAME = "kotlin-noarg"
const val NOARG_ARTIFACT_NAME = "kotlin-noarg"
private val ANNOTATION_ARG_NAME = "annotation"
private val PRESET_ARG_NAME = "preset"
@@ -105,7 +82,7 @@ class NoArgKotlinGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
return options
}
override fun getArtifactName() = "kotlin-noarg"
override fun getGroupName() = "org.jetbrains.kotlin"
override fun getCompilerPluginId() = "org.jetbrains.kotlin.noarg"
override fun getPluginArtifact(): SubpluginArtifact =
JetBrainsSubpluginArtifact(artifactId = NOARG_ARTIFACT_NAME)
}