From 9164b7d4050fcd4597a21acf3249d2b18624143a Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 9 Oct 2023 14:55:50 +0200 Subject: [PATCH] K2 kapt: remove reference to "kapt 4" from the warning #KT-62438 Fixed --- compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt | 2 +- .../src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt index dec77177b26..70cd63a4bd2 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt @@ -79,7 +79,7 @@ private fun switchToFallbackModeIfNecessary(arguments: CommonCompilerArguments, arguments.allowUnstableDependencies = true } arguments.useKapt4 -> warn( - if (isK2) "Kapt 4 is an experimental feature. Use with caution." + if (isK2) "K2 kapt is an experimental feature. Use with caution." else "-Xuse-kapt4 flag can be only used with language version 2.0+." ) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt index 8503f325dd5..b0c09d30fb8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt @@ -1313,12 +1313,12 @@ open class Kapt3IT : Kapt3BaseIT() { assertKaptSuccessful() assertTasksExecuted(":kaptGenerateStubsKotlin", ":kaptKotlin", ":compileKotlin") assertOutputDoesNotContain("Falling back to 1.9.") - assertOutputContains("Kapt 4 is an experimental feature. Use with caution.") + assertOutputContains("K2 kapt is an experimental feature. Use with caution.") } build("-Pkapt.use.k2=true", "cleanCompileKotlin", "compileKotlin") { assertTasksExecuted(":compileKotlin") // The warning should not be displayed for the compile task. - assertOutputDoesNotContain("Kapt 4 is an experimental feature. Use with caution.") + assertOutputDoesNotContain("K2 kapt is an experimental feature. Use with caution.") } } }