diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt index ac5967191e9..9f574990ed8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt @@ -69,7 +69,9 @@ class BuildCacheRelocationIT : KGPBaseTest() { secondProject, listOf(":classes", ":testClasses"), listOf(":kaptKotlin", ":kaptGenerateStubsKotlin", ":compileKotlin", ":compileTestKotlin", ":compileJava") - ) + ) { + assertNoBuildWarnings(expectedK2KaptWarnings) + } } @JsGradlePluginTests @@ -294,16 +296,19 @@ class BuildCacheRelocationIT : KGPBaseTest() { firstProject: TestProject, secondProject: TestProject, tasksToExecute: List, - cacheableTasks: List + cacheableTasks: List, + additionalAssertions: BuildResult.() -> Unit = {}, ) { firstProject.build(*tasksToExecute.toTypedArray()) { assertTasksPackedToCache(*cacheableTasks.toTypedArray()) + additionalAssertions() } firstProject.build("clean") secondProject.build(*tasksToExecute.toTypedArray()) { assertTasksFromCache(*cacheableTasks.toTypedArray()) + additionalAssertions() } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildServiceDeclarationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildServiceDeclarationIT.kt index 89bb5811e4a..2d74bf1868c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildServiceDeclarationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildServiceDeclarationIT.kt @@ -76,6 +76,7 @@ class BuildServiceDeclarationIT : KGPBaseTest() { enableStableConfigurationCachePreview() build("build") { assertOutputDoesNotContainBuildServiceDeclarationWarnings() + assertNoBuildWarnings(expectedK2KaptWarnings) } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UnnamedTaskInputsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UnnamedTaskInputsIT.kt index 92bf3f786d7..57d4bd1e971 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UnnamedTaskInputsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UnnamedTaskInputsIT.kt @@ -70,6 +70,7 @@ class UnnamedTaskInputsIT : KGPBaseTest() { build("assemble") { assertNoUnnamedInputsOutputs() + assertNoBuildWarnings(expectedK2KaptWarnings) } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/outputAssertions.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/outputAssertions.kt index 19199faed69..0e63d58e6a4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/outputAssertions.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/outputAssertions.kt @@ -172,6 +172,11 @@ fun BuildResult.assertNoBuildWarnings( } } +val expectedK2KaptWarnings = setOf( + "w: [InternalKotlinGradlePluginPropertiesUsed | WARNING] ATTENTION! This build uses the following Kotlin Gradle Plugin properties:", + "w: Kapt currently doesn't support language version 2.0+. Falling back to 1.9." +) + /** * Asserts compilation is running via Kotlin daemon with given jvm arguments. */ diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/simple/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/simple/build.gradle index c940dd01607..9a09f117bec 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/simple/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/simple/build.gradle @@ -19,5 +19,5 @@ dependencies { } tasks.named("compileKotlin", KotlinJvmCompile) { - compilerOptions.allWarningsAsErrors = true + compilerOptions.allWarningsAsErrors = false // compilation with LV=2.0 prints warning about kapt fallback }