[Gradle] Restore Kapt import compatibility with older Kotlin plugin releases
Still supported IDEA/Kotlin plugin releases relies on 'kotlin-annotation-processing-gradle' artifact name in compiler plugins classpath. I've restored this publication usage until we will stop support Kotlin plugin versions that doesn't know about 'kotlin-annotation-processing-embeddable' name. ^KTIJ-25586 Fixed
This commit is contained in:
committed by
Space Team
parent
97adb01600
commit
4a501a257e
@@ -104,7 +104,6 @@ dependencies {
|
||||
commonImplementation(project(":compiler:build-tools:kotlin-build-tools-api"))
|
||||
|
||||
commonRuntimeOnly(project(":kotlin-compiler-embeddable"))
|
||||
commonRuntimeOnly(project(":kotlin-annotation-processing-embeddable"))
|
||||
commonRuntimeOnly(project(":kotlin-android-extensions"))
|
||||
commonRuntimeOnly(project(":kotlin-compiler-runner")) {
|
||||
// Excluding dependency with not-relocated 'com.intellij' types
|
||||
|
||||
+1
-1
@@ -72,7 +72,7 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To
|
||||
|
||||
val MAIN_KAPT_CONFIGURATION_NAME = "kapt"
|
||||
|
||||
const val KAPT_ARTIFACT_NAME = "kotlin-annotation-processing-embeddable"
|
||||
const val KAPT_ARTIFACT_NAME = "kotlin-annotation-processing-gradle"
|
||||
val KAPT_SUBPLUGIN_ID = "org.jetbrains.kotlin.kapt3"
|
||||
|
||||
fun getKaptConfigurationName(sourceSetName: String): String {
|
||||
|
||||
+1
-1
@@ -199,7 +199,7 @@ internal class KaptWithoutKotlincConfig : KaptConfig<KaptWithoutKotlincTask> {
|
||||
project.configurations.findByName(Kapt3GradleSubplugin.KAPT_WORKER_DEPENDENCIES_CONFIGURATION_NAME)
|
||||
?: project.configurations.create(Kapt3GradleSubplugin.KAPT_WORKER_DEPENDENCIES_CONFIGURATION_NAME).apply {
|
||||
dependencies.addAllLater(project.listProperty {
|
||||
val kaptDependency = "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:${project.getKotlinPluginVersion()}"
|
||||
val kaptDependency = "org.jetbrains.kotlin:kotlin-annotation-processing-gradle:${project.getKotlinPluginVersion()}"
|
||||
listOf(
|
||||
project.dependencies.create(kaptDependency),
|
||||
project.dependencies.kotlinDependency(
|
||||
|
||||
Reference in New Issue
Block a user