Add back empty stub implementations of KotlinGradleSubplugin (KT-39809)
* If a KotlinGradleSubplugin implements KotlinCompilerPluginSupportPlugin, don't apply it as a legacy plugin * Add the legacy KotlinGradleSubplugin implementations back so that when there's JAR hell with META-INF/services in the old artifacts pointing to the classes, loading the plugins with ServiceLoader (legacy implementation) from the new artifacts would not fail. * There's a corner case for plugins not in kotlin-gradle-plugin If a newer and older version of such a subplugin is used with an older version of the Kotlin Gradle plugin, the latter will find the META-INF entries and will try to load the subplugins from the new version. With the original fix for KT-39809, this would result in silently ignored empty stub implementations. Given that the Kotlin Gradle plugin can now check if a subplugin supports the new API, it's OK to keep the old entries and make the stub implementations throw a build error when called, so that improper plugin versions are not ignored and are clearly reported. Note that this is only necessary for the subplugins not bundled in the kotlin-gradle-plugin module, as those will always be in sync with the Kotlin version. Issue #KT-39809 Fixed
This commit is contained in:
+25
-1
@@ -16,15 +16,22 @@
|
||||
|
||||
package org.jetbrains.kotlin.allopen.gradle
|
||||
|
||||
import org.gradle.api.GradleException
|
||||
import org.gradle.api.Project
|
||||
import org.gradle.api.provider.Provider
|
||||
import org.gradle.api.tasks.compile.AbstractCompile
|
||||
import org.gradle.tooling.provider.model.ToolingModelBuilder
|
||||
import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry
|
||||
import org.jetbrains.kotlin.allopen.gradle.model.builder.AllOpenModelBuilder
|
||||
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
|
||||
import org.jetbrains.kotlin.gradle.plugin.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class AllOpenGradleSubplugin @Inject internal constructor(private val registry: ToolingModelBuilderRegistry) :
|
||||
KotlinCompilerPluginSupportPlugin {
|
||||
KotlinCompilerPluginSupportPlugin,
|
||||
@Suppress("DEPRECATION") // implementing to fix KT-39809
|
||||
KotlinGradleSubplugin<AbstractCompile> {
|
||||
|
||||
companion object {
|
||||
fun getAllOpenExtension(project: Project): AllOpenExtension {
|
||||
return project.extensions.getByType(AllOpenExtension::class.java)
|
||||
@@ -68,4 +75,21 @@ class AllOpenGradleSubplugin @Inject internal constructor(private val registry:
|
||||
override fun getCompilerPluginId() = "org.jetbrains.kotlin.allopen"
|
||||
override fun getPluginArtifact(): SubpluginArtifact =
|
||||
JetBrainsSubpluginArtifact(artifactId = ALLOPEN_ARTIFACT_NAME)
|
||||
|
||||
//region Stub implementation for legacy API, KT-39809
|
||||
internal constructor(): this(object : ToolingModelBuilderRegistry {
|
||||
override fun register(p0: ToolingModelBuilder) = Unit
|
||||
override fun getBuilder(p0: String): ToolingModelBuilder? = null
|
||||
})
|
||||
|
||||
override fun isApplicable(project: Project, task: AbstractCompile): Boolean = true
|
||||
|
||||
override fun apply(
|
||||
project: Project, kotlinCompile: AbstractCompile, javaCompile: AbstractCompile?, variantData: Any?, androidProjectHandler: Any?,
|
||||
kotlinCompilation: KotlinCompilation<KotlinCommonOptions>?
|
||||
): List<SubpluginOption> = throw GradleException(
|
||||
"This version of the kotlin-allopen Gradle plugin is built for a newer Kotlin version. " +
|
||||
"Please use an older version of kotlin-allopen or upgrade the Kotlin version to make them match."
|
||||
)
|
||||
//endregion
|
||||
}
|
||||
+1
@@ -0,0 +1 @@
|
||||
org.jetbrains.kotlin.allopen.gradle.AllOpenGradleSubplugin
|
||||
Reference in New Issue
Block a user