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

K2 kapt: remove reference to "kapt 4" from the warning

Browse Source 
#KT-62438 Fixed
This commit is contained in:
Alexander Udalov
2023-10-09 14:55:50 +02:00
committed by Space Team
parent 79193006ce
commit 9164b7d405
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt
+1 -1
View File
@@ -79,7 +79,7 @@ private fun switchToFallbackModeIfNecessary(arguments: CommonCompilerArguments,
arguments.allowUnstableDependencies = true arguments.allowUnstableDependencies = true
} }
arguments.useKapt4 -> warn( 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+." else "-Xuse-kapt4 flag can be only used with language version 2.0+."
) )
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
+2 -2
View File
@@ -1313,12 +1313,12 @@ open class Kapt3IT : Kapt3BaseIT() {
assertKaptSuccessful() assertKaptSuccessful()
assertTasksExecuted(":kaptGenerateStubsKotlin", ":kaptKotlin", ":compileKotlin") assertTasksExecuted(":kaptGenerateStubsKotlin", ":kaptKotlin", ":compileKotlin")
assertOutputDoesNotContain("Falling back to 1.9.") 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") { build("-Pkapt.use.k2=true", "cleanCompileKotlin", "compileKotlin") {
assertTasksExecuted(":compileKotlin") assertTasksExecuted(":compileKotlin")
// The warning should not be displayed for the compile task. // 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.")
} }
} }
} }