From 21624d6d07ea46fbf0dc3ad87a7cb72104653f68 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Mon, 16 Jan 2023 21:19:31 +0100 Subject: [PATCH] [Gradle] Add version checks on warnings suppression for old AGP versions --- .../org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt | 8 ++++---- .../org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt index 43ecba62b8c..4c1a84173fb 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt @@ -356,10 +356,10 @@ class MultiplatformGradleIT : BaseGradleIT() { options = defaultBuildOptions().copy( androidGradlePluginVersion = AGPVersion.v4_2_0, androidHome = KtTestUtil.findAndroidSdk().also { acceptAndroidSdkLicenses(it) }, - // Workaround for a deprecation warning from AGP - // Relying on FileTrees for ignoring empty directories when using @SkipWhenEmpty has been deprecated. - warningMode = WarningMode.None, - ), + ).suppressDeprecationWarningsOnAgpLessThan( + AGPVersion.v7_3_0, + "uses deprecated IncrementalTaskInputs; relies on FileTrees for ignoring empty directories when using @SkipWhenEmpty" + ) ) { assertSuccessful() assertTasksExecuted(":lib1:compileDebugKotlin") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index 85f81763ea5..70f0bfb3ccd 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -1577,9 +1577,9 @@ class NewMultiplatformIT : BaseGradleIT() { // https://issuetracker.google.com/issues/152187160 options = defaultBuildOptions().copy( androidGradlePluginVersion = AGPVersion.v4_2_0, - // Workaround for a deprecation warning from AGP - // Relying on FileTrees for ignoring empty directories when using @SkipWhenEmpty has been deprecated. - warningMode = WarningMode.None, + ).suppressDeprecationWarningsOnAgpLessThan( + AGPVersion.v7_3_0, + "uses deprecated IncrementalTaskInputs; relies on FileTrees for ignoring empty directories when using @SkipWhenEmpty" ) ) { assertSuccessful()