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

[Gradle, MPP] Suppress deprecation warnings for old AGP in AndroidAndJavaConsumeMppLibIT

Browse Source 
There are deprecation warnings coming from AGP which have fixed since 7.3.0
#KT-52998 In Progress
This commit is contained in:
Alexander.Likhachev
2023-01-12 22:19:46 +01:00
committed by Space Team
parent 822c12c892
commit 1e102d3e00
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt
+8 -1
View File
@@ -7,8 +7,10 @@
package org.jetbrains.kotlin.gradle.mpp package org.jetbrains.kotlin.gradle.mpp
import org.gradle.api.logging.configuration.WarningMode import org.gradle.api.logging.configuration.WarningMode
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.BaseGradleIT import org.jetbrains.kotlin.gradle.BaseGradleIT
import org.jetbrains.kotlin.gradle.GradleVersionRequired import org.jetbrains.kotlin.gradle.GradleVersionRequired
import org.jetbrains.kotlin.gradle.chooseWrapperVersionOrFinishTest
import org.jetbrains.kotlin.gradle.embedProject import org.jetbrains.kotlin.gradle.embedProject
import org.jetbrains.kotlin.gradle.mpp.ResolvedVariantChecker.ResolvedVariantRequest import org.jetbrains.kotlin.gradle.mpp.ResolvedVariantChecker.ResolvedVariantRequest
import org.jetbrains.kotlin.gradle.testbase.TestVersions import org.jetbrains.kotlin.gradle.testbase.TestVersions
@@ -216,7 +218,9 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() {
""""com.example:lib:1.0"""" """"com.example:lib:1.0""""
else "project(\":${dependencyProject.projectName}:lib\")" else "project(\":${dependencyProject.projectName}:lib\")"
val usedConsumerGradleVersion: String
val consumerProject = Project("AndroidProject", consumerGradleVersion).apply { val consumerProject = Project("AndroidProject", consumerGradleVersion).apply {
usedConsumerGradleVersion = chooseWrapperVersionOrFinishTest()
projectDir.deleteRecursively() projectDir.deleteRecursively()
if (!isPublishedLibrary) { if (!isPublishedLibrary) {
embedProject(dependencyProject) embedProject(dependencyProject)
@@ -284,11 +288,14 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() {
"com.example:lib:1.0" "com.example:lib:1.0"
else ":${dependencyProject.projectName}:lib" 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( val consumerBuildOptions = defaultBuildOptions().copy(
javaHome = File(System.getProperty("jdk11Home")), javaHome = File(System.getProperty("jdk11Home")),
androidHome = KtTestUtil.findAndroidSdk(), androidHome = KtTestUtil.findAndroidSdk(),
androidGradlePluginVersion = consumerAgpVersion, androidGradlePluginVersion = consumerAgpVersion,
kotlinVersion = withKotlinVersion ?: defaultBuildOptions().kotlinVersion kotlinVersion = withKotlinVersion ?: defaultBuildOptions().kotlinVersion,
warningMode = consumerWarningMode
) )
val variantCheckRequests = mutableMapOf<ResolvedVariantRequest, String>() val variantCheckRequests = mutableMapOf<ResolvedVariantRequest, String>()