From 1e102d3e0046b1c44cb084156b9f8a49afa493a3 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Thu, 12 Jan 2023 22:19:46 +0100 Subject: [PATCH] [Gradle, MPP] Suppress deprecation warnings for old AGP in AndroidAndJavaConsumeMppLibIT There are deprecation warnings coming from AGP which have fixed since 7.3.0 #KT-52998 In Progress --- .../kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt index eba2d747fac..db67c7cd93b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt @@ -7,8 +7,10 @@ package org.jetbrains.kotlin.gradle.mpp import org.gradle.api.logging.configuration.WarningMode +import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.BaseGradleIT import org.jetbrains.kotlin.gradle.GradleVersionRequired +import org.jetbrains.kotlin.gradle.chooseWrapperVersionOrFinishTest import org.jetbrains.kotlin.gradle.embedProject import org.jetbrains.kotlin.gradle.mpp.ResolvedVariantChecker.ResolvedVariantRequest import org.jetbrains.kotlin.gradle.testbase.TestVersions @@ -216,7 +218,9 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() { """"com.example:lib:1.0"""" else "project(\":${dependencyProject.projectName}:lib\")" + val usedConsumerGradleVersion: String val consumerProject = Project("AndroidProject", consumerGradleVersion).apply { + usedConsumerGradleVersion = chooseWrapperVersionOrFinishTest() projectDir.deleteRecursively() if (!isPublishedLibrary) { embedProject(dependencyProject) @@ -284,11 +288,14 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() { "com.example:lib:1.0" else ":${dependencyProject.projectName}:lib" + val consumerWarningMode = + if (consumerAgpVersion >= AGPVersion.v7_3_0 || GradleVersion.version(usedConsumerGradleVersion) < GradleVersion.version("7.5")) WarningMode.Fail else WarningMode.None val consumerBuildOptions = defaultBuildOptions().copy( javaHome = File(System.getProperty("jdk11Home")), androidHome = KtTestUtil.findAndroidSdk(), androidGradlePluginVersion = consumerAgpVersion, - kotlinVersion = withKotlinVersion ?: defaultBuildOptions().kotlinVersion + kotlinVersion = withKotlinVersion ?: defaultBuildOptions().kotlinVersion, + warningMode = consumerWarningMode ) val variantCheckRequests = mutableMapOf()