From 49ee1975785a88a9702698ca906bc856ad269826 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Wed, 13 Mar 2019 16:37:46 +0300 Subject: [PATCH] Ignore deprecated configurations in a test with Gradle 5.3+ (KT-30378) --- .../kotlin/gradle/VariantAwareDependenciesIT.kt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt index 0af158c6300..4068513b72e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt @@ -77,6 +77,20 @@ class VariantAwareDependenciesIT : BaseGradleIT() { it.replace("apply plugin: \"kotlin\"", "") .replace("\"org.jetbrains.kotlin:kotlin-stdlib\"", "\"org.jetbrains.kotlin:kotlin-stdlib:\$kotlin_version\"") } + + if (testGradleVersionAtLeast("5.3-rc-1")) { + gradleBuildScript().appendText( + // In Gradle 5.3, the variants of a Kotlin MPP can't be disambiguated in a pure Java project's deprecated + // configurations that don't have a proper 'org.gradle.usage' attribute value, see KT-30378 + "\n" + """ + configurations { + configure([compile, runtime, testCompile, testRuntime, getByName('default')]) { + canBeResolved = false + } + } + """.trimIndent() + ) + } } with(outerProject) {