diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt index f451bd72b55..986fccd0fd8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.gradle import org.gradle.api.logging.configuration.WarningMode +import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType import org.jetbrains.kotlin.gradle.util.* import org.junit.Test @@ -297,16 +298,27 @@ class VariantAwareDependenciesMppIT : BaseGradleIT() { it.replace("'com.example:sample-lib:1.0'", "project('${libProject.projectName}')") } + val testGradleVersion = chooseWrapperVersionOrFinishTest() + val isAtLeastGradle75 = GradleVersion.version(testGradleVersion) >= GradleVersion.version("7.5") + listOf("jvm6" to "Classpath", "nodeJs" to "Classpath").forEach { (target, suffix) -> build("dependencyInsight", "--configuration", "${target}Compile$suffix", "--dependency", "sample-lib") { assertSuccessful() - assertContains("variant \"${target}ApiElements\" [") + if (isAtLeastGradle75) { + assertContains("Variant ${target}ApiElements") + } else { + assertContains("variant \"${target}ApiElements\" [") + } } if (suffix == "Classpath") { build("dependencyInsight", "--configuration", "${target}Runtime$suffix", "--dependency", "sample-lib") { assertSuccessful() - assertContains("variant \"${target}RuntimeElements\" [") + if (isAtLeastGradle75) { + assertContains("Variant ${target}RuntimeElements") + } else { + assertContains("variant \"${target}RuntimeElements\" [") + } } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt index f4d7d296573..a639435330a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt @@ -7,10 +7,9 @@ package org.jetbrains.kotlin.gradle.native import com.intellij.testFramework.TestDataFile import org.gradle.api.logging.configuration.WarningMode +import org.gradle.util.GradleVersion import org.jdom.input.SAXBuilder -import org.jetbrains.kotlin.gradle.BaseGradleIT -import org.jetbrains.kotlin.gradle.GradleVersionRequired -import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi +import org.jetbrains.kotlin.gradle.* import org.jetbrains.kotlin.gradle.internals.DISABLED_NATIVE_TARGETS_REPORTER_DISABLE_WARNING_PROPERTY_NAME import org.jetbrains.kotlin.gradle.internals.DISABLED_NATIVE_TARGETS_REPORTER_WARNING_PREFIX import org.jetbrains.kotlin.gradle.internals.NO_NATIVE_STDLIB_PROPERTY_WARNING @@ -1109,10 +1108,21 @@ class GeneralNativeIT : BaseGradleIT() { } fun CompiledProject.assertVariantInDependencyInsight(variantName: String) { + val testGradleVersion = chooseWrapperVersionOrFinishTest() + val isAtLeastGradle75 = GradleVersion.version(testGradleVersion) >= GradleVersion.version("7.5") try { - assertContains("variant \"$variantName\" [") + if (isAtLeastGradle75) { + assertContains("Variant $variantName") + } else { + assertContains("variant \"$variantName\" [") + } } catch (originalError: AssertionError) { - val matchedVariants = Regex("variant \"(.*?)\" \\[").findAll(output).toList() + val regexPattern = if (isAtLeastGradle75) { + "Variant (.*?):" + } else { + "variant \"(.*?)\" \\[" + } + val matchedVariants = Regex(regexPattern).findAll(output).toList() throw AssertionError( "Expected variant $variantName. " + if (matchedVariants.isNotEmpty())