From 7f5eb3f5ff7fa1eb1293a305f4141c80d109730b Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Tue, 16 Nov 2021 17:35:10 -0500 Subject: [PATCH] Fix incorrect kapt classpath error message. The correct value is `kapt.include.compile.classpath` ^KT-47002 Fixed --- .../kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt | 2 +- .../org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt index a2b24d2c3dd..58567783691 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt @@ -621,7 +621,7 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To if (includeCompileClasspath && project.classLoadersCacheSize() > 0) { project.logger.warn( "ClassLoaders cache can't be enabled together with AP discovery in compilation classpath." - + "\nSet 'kapt.includeCompileClasspath = false' to disable discovery" + + "\nSet 'kapt.include.compile.classpath=false' to disable discovery" ) } else { it.classLoadersCacheSize = project.classLoadersCacheSize() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt index fab3e1ac0e8..2f74da58b00 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt @@ -226,7 +226,7 @@ abstract class KaptTask @Inject constructor( if (logger.isInfoEnabled) { logger.warn( "Annotation processors discovery from compile classpath is deprecated." - + "\nSet 'kapt.includeCompileClasspath = false' to disable discovery." + + "\nSet 'kapt.include.compile.classpath=false' to disable discovery." + "\nThe following files, containing annotation processors, are not present in KAPT classpath:\n" + processorsAbsentInKaptClasspath.joinToString("\n") { " '$it'" } + "\nAdd corresponding dependencies to any of the following configurations:\n" @@ -235,7 +235,7 @@ abstract class KaptTask @Inject constructor( } else { logger.warn( "Annotation processors discovery from compile classpath is deprecated." - + "\nSet 'kapt.includeCompileClasspath = false' to disable discovery." + + "\nSet 'kapt.include.compile.classpath=false' to disable discovery." + "\nRun the build with '--info' for more details." ) }