diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index 1c96db62809..2ce8e0bdd64 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -999,6 +999,16 @@ fun BaseGradleIT.BuildOptions.withFreeCommandLineArgument(argument: String) = co freeCommandLineArgs = freeCommandLineArgs + argument ) +fun BaseGradleIT.BuildOptions.suppressDeprecationWarningsOnAgpLessThan( + agpVersion: AGPVersion, + @Suppress("UNUSED_PARAMETER") reason: String // just to require specifying a reason for suppressing +) = + if ((androidGradlePluginVersion ?: error("AGP version expected to be configured")) >= agpVersion) { + this + } else { + copy(warningMode = WarningMode.All) + } + private const val MAVEN_LOCAL_URL_PLACEHOLDER = "" internal const val PLUGIN_MARKER_VERSION_PLACEHOLDER = "" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt index 8b25d86db23..ed9fcbc69db 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.native import org.gradle.api.logging.configuration.WarningMode import org.jetbrains.kotlin.gradle.BaseGradleIT import org.jetbrains.kotlin.gradle.GradleVersionRequired +import org.jetbrains.kotlin.gradle.suppressDeprecationWarningsOnAgpLessThan import org.jetbrains.kotlin.gradle.util.AGPVersion import org.jetbrains.kotlin.gradle.util.modify import org.jetbrains.kotlin.konan.target.HostManager @@ -136,6 +137,9 @@ class AppleFrameworkIT : BaseGradleIT() { "TARGET_BUILD_DIR" to "testBuildDir", "FRAMEWORKS_FOLDER_PATH" to "testFrameworksDir" ) + ).suppressDeprecationWarningsOnAgpLessThan( + AGPVersion.v7_3_0, + "uses deprecated IncrementalTaskInputs" ) build("tasks", options = options) { assertSuccessful() @@ -164,6 +168,9 @@ class AppleFrameworkIT : BaseGradleIT() { "SDK_NAME" to "iphoneos", "ARCHS" to "arm64" ) + ).suppressDeprecationWarningsOnAgpLessThan( + AGPVersion.v7_3_0, + "uses deprecated IncrementalTaskInputs" ) build("tasks", options = options) { assertSuccessful() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt index 0a6790ab67e..af2e370a638 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt @@ -5,8 +5,10 @@ package org.jetbrains.kotlin.gradle.native +import org.gradle.api.logging.configuration.WarningMode import org.jetbrains.kotlin.gradle.BaseGradleIT import org.jetbrains.kotlin.gradle.GradleVersionRequired +import org.jetbrains.kotlin.gradle.suppressDeprecationWarningsOnAgpLessThan import org.jetbrains.kotlin.gradle.transformProjectWithPluginsDsl import org.jetbrains.kotlin.gradle.util.AGPVersion import org.jetbrains.kotlin.konan.target.HostManager @@ -93,7 +95,11 @@ class XCFrameworkIT : BaseGradleIT() { @Test fun `check there aren't XCFramework tasks without declaration in build script`() { with(Project("sharedAppleFramework")) { - build("tasks") { + val options = defaultBuildOptions().suppressDeprecationWarningsOnAgpLessThan( + AGPVersion.v7_3_0, + "uses deprecated IncrementalTaskInputs" + ) + build("tasks", options = options) { assertSuccessful() assertTasksNotRegistered( ":shared:assembleSharedDebugXCFramework",