[Gradle] Update AGP versions in tests
^KT-69026 Fixed
(cherry picked from commit 2b4c34d66098d3d67fe021ff2acf166825de0d8f)
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt
index e0fa742..c5070e3 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt
@@ -24,8 +24,8 @@
// This integration allows AGP to configure android target in MPP.
@AndroidTestVersions(
minVersion = TestVersions.AGP.AGP_82,
- maxVersion = TestVersions.AGP.AGP_85,
- additionalVersions = [TestVersions.AGP.AGP_83, TestVersions.AGP.AGP_84],
+ maxVersion = TestVersions.AGP.AGP_86,
+ additionalVersions = [TestVersions.AGP.AGP_83, TestVersions.AGP.AGP_84, TestVersions.AGP.AGP_85],
)
@AndroidGradlePluginTests
class ExternalAndroidTargetIT : KGPBaseTest() {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
index 528c8cb..0d46212 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
@@ -56,12 +56,12 @@
const val AGP_82 = "8.2.2"
const val AGP_83 = "8.3.2"
const val AGP_84 = "8.4.0"
- const val AGP_85 = "8.5.0-beta01"
- const val AGP_86 = "8.6.0-alpha01"
+ const val AGP_85 = "8.5.0-rc01"
+ const val AGP_86 = "8.6.0-alpha05"
// Should be in sync with KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck
const val MIN_SUPPORTED = AGP_71 // KotlinAndroidPlugin.minimalSupportedAgpVersion
- const val MAX_SUPPORTED = AGP_84 // Update once Gradle MAX_SUPPORTED version will be bumped
+ const val MAX_SUPPORTED = AGP_85 // Update once Gradle MAX_SUPPORTED version will be bumped
}
enum class AgpCompatibilityMatrix(
@@ -79,8 +79,8 @@
AGP_82(AGP.AGP_82, GradleVersion.version(Gradle.G_8_2), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17),
AGP_83(AGP.AGP_83, GradleVersion.version(Gradle.G_8_4), GradleVersion.version(Gradle.G_8_7), JavaVersion.VERSION_17),
AGP_84(AGP.AGP_84, GradleVersion.version(Gradle.G_8_6), GradleVersion.version(Gradle.G_8_7), JavaVersion.VERSION_17),
- AGP_85(AGP.AGP_85, GradleVersion.version(Gradle.G_8_6), GradleVersion.version(Gradle.G_8_7), JavaVersion.VERSION_17),
- AGP_86(AGP.AGP_86, GradleVersion.version(Gradle.G_8_6), GradleVersion.version(Gradle.G_8_7), JavaVersion.VERSION_17),
+ AGP_85(AGP.AGP_85, GradleVersion.version(Gradle.G_8_7), GradleVersion.version(Gradle.G_8_7), JavaVersion.VERSION_17),
+ AGP_86(AGP.AGP_86, GradleVersion.version(Gradle.G_8_7), GradleVersion.version(Gradle.G_8_7), JavaVersion.VERSION_17),
;
}
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/JavaOnly/compileClasspath.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/JavaOnly/compileClasspath.txt
index ee39044..ab7149d 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/JavaOnly/compileClasspath.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/JavaOnly/compileClasspath.txt
@@ -4,7 +4,7 @@
sample.gradle_6_8_3:kmp_native_jvm_kgp_snapshot:1.0 => [jvmApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-jvm:1.0 => [jvmApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [jvmApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [jvmApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [jvmApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot-jvm:1.0 => [jvmApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot:1.0 => [jvmApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/kmp_native_jvm_kgp_snapshot/jvmCompileClasspath.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/kmp_native_jvm_kgp_snapshot/jvmCompileClasspath.txt
index 50e67d7..e5b6bbf 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/kmp_native_jvm_kgp_snapshot/jvmCompileClasspath.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/kmp_native_jvm_kgp_snapshot/jvmCompileClasspath.txt
@@ -5,8 +5,8 @@
sample.gradle_6_8_3:kmp_native_jvm_kgp_snapshot:1.0 => [jvmApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-jvm:1.0 => [jvmApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [jvmApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [jvmApiElements-published]
sample.gradle_max:JavaOnly:1.0 => [apiElements]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [jvmApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot-jvm:1.0 => [jvmApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot:1.0 => [jvmApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/kmp_native_jvm_kgp_snapshot/linuxArm64CompileKlibraries.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/kmp_native_jvm_kgp_snapshot/linuxArm64CompileKlibraries.txt
index 7f91bf1..3c12994 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/kmp_native_jvm_kgp_snapshot/linuxArm64CompileKlibraries.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/kmp_native_jvm_kgp_snapshot/linuxArm64CompileKlibraries.txt
@@ -5,9 +5,9 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxArm64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-linuxarm64:1.0 => [linuxArm64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot-linuxarm64:1.0 => [linuxArm64ApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot:1.0 => [linuxArm64ApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/kmp_native_jvm_kgp_snapshot/linuxX64CompileKlibraries.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/kmp_native_jvm_kgp_snapshot/linuxX64CompileKlibraries.txt
index 351f87d..e5fbf7f 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/kmp_native_jvm_kgp_snapshot/linuxX64CompileKlibraries.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_6_8_3/kmp_native_jvm_kgp_snapshot/linuxX64CompileKlibraries.txt
@@ -5,9 +5,9 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxX64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-linuxx64:1.0 => [linuxX64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot-linuxx64:1.0 => [linuxX64ApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot:1.0 => [linuxX64ApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/AndroidOnly_kgp_snapshot_agp_7_1_3/releaseCompileClasspath.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/AndroidOnly_kgp_snapshot_agp_7_1_3/releaseCompileClasspath.txt
index aac426e..639cca8 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/AndroidOnly_kgp_snapshot_agp_7_1_3/releaseCompileClasspath.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/AndroidOnly_kgp_snapshot_agp_7_1_3/releaseCompileClasspath.txt
@@ -4,7 +4,7 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [releaseApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-android:1.0 => [releaseApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_android_kgp_snapshot_agp_7_1_3/androidReleaseCompileClasspath.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_android_kgp_snapshot_agp_7_1_3/androidReleaseCompileClasspath.txt
index 42d24df..6fc6052 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_android_kgp_snapshot_agp_7_1_3/androidReleaseCompileClasspath.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_android_kgp_snapshot_agp_7_1_3/androidReleaseCompileClasspath.txt
@@ -5,8 +5,8 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [releaseApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-android:1.0 => [releaseApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:AndroidOnly_kgp_snapshot_agp_max:1.0 => [releaseVariantDefaultApiPublication]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
+sample.gradle_max:AndroidOnly_kgp_snapshot_agp_max:1.0 => [releaseVariantDefaultApiPublication]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_android_kgp_snapshot_agp_7_1_3/linuxArm64CompileKlibraries.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_android_kgp_snapshot_agp_7_1_3/linuxArm64CompileKlibraries.txt
index 110d12c..71702d8 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_android_kgp_snapshot_agp_7_1_3/linuxArm64CompileKlibraries.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_android_kgp_snapshot_agp_7_1_3/linuxArm64CompileKlibraries.txt
@@ -3,7 +3,7 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxArm64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-linuxarm64:1.0 => [linuxArm64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_android_kgp_snapshot_agp_7_1_3/linuxX64CompileKlibraries.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_android_kgp_snapshot_agp_7_1_3/linuxX64CompileKlibraries.txt
index da21ff8..ba1e818 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_android_kgp_snapshot_agp_7_1_3/linuxX64CompileKlibraries.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_android_kgp_snapshot_agp_7_1_3/linuxX64CompileKlibraries.txt
@@ -3,7 +3,7 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxX64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-linuxx64:1.0 => [linuxX64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/androidReleaseCompileClasspath.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/androidReleaseCompileClasspath.txt
index fcd047b..d37e753 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/androidReleaseCompileClasspath.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/androidReleaseCompileClasspath.txt
@@ -5,8 +5,8 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [releaseApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-android:1.0 => [releaseApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:AndroidOnly_kgp_snapshot_agp_max:1.0 => [releaseVariantDefaultApiPublication]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
+sample.gradle_max:AndroidOnly_kgp_snapshot_agp_max:1.0 => [releaseVariantDefaultApiPublication]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/jvmCompileClasspath.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/jvmCompileClasspath.txt
index 990854f..756dc08 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/jvmCompileClasspath.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/jvmCompileClasspath.txt
@@ -2,5 +2,5 @@
project :kmp_native_jvm_android_kgp_snapshot_agp_7_1_3 => [jvmCompileClasspath]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-jvm:1.0 => [jvmApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [jvmApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [jvmApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [jvmApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/linuxArm64CompileKlibraries.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/linuxArm64CompileKlibraries.txt
index 3af885c..4b00018 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/linuxArm64CompileKlibraries.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/linuxArm64CompileKlibraries.txt
@@ -3,7 +3,7 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxArm64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-linuxarm64:1.0 => [linuxArm64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/linuxX64CompileKlibraries.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/linuxX64CompileKlibraries.txt
index 38262ec..a624847 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/linuxX64CompileKlibraries.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_7_2/kmp_native_jvm_android_kgp_snapshot_agp_7_1_3/linuxX64CompileKlibraries.txt
@@ -3,7 +3,7 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxX64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-linuxx64:1.0 => [linuxX64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/AndroidOnly_kgp_snapshot_agp_max/releaseCompileClasspath.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/AndroidOnly_kgp_snapshot_agp_max/releaseCompileClasspath.txt
similarity index 72%
rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/AndroidOnly_kgp_snapshot_agp_max/releaseCompileClasspath.txt
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/AndroidOnly_kgp_snapshot_agp_max/releaseCompileClasspath.txt
index 89ec462..5a2e14a 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/AndroidOnly_kgp_snapshot_agp_max/releaseCompileClasspath.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/AndroidOnly_kgp_snapshot_agp_max/releaseCompileClasspath.txt
@@ -4,7 +4,7 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [releaseApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-android:1.0 => [releaseApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/JavaOnly/compileClasspath.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/JavaOnly/compileClasspath.txt
index ee39044..ab7149d 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/JavaOnly/compileClasspath.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/JavaOnly/compileClasspath.txt
@@ -4,7 +4,7 @@
sample.gradle_6_8_3:kmp_native_jvm_kgp_snapshot:1.0 => [jvmApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-jvm:1.0 => [jvmApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [jvmApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [jvmApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [jvmApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot-jvm:1.0 => [jvmApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot:1.0 => [jvmApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt
similarity index 72%
rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt
index fd8d7f3..a65c2b0 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt
@@ -5,8 +5,8 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [releaseApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-android:1.0 => [releaseApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:AndroidOnly_kgp_snapshot_agp_max:1.0 => [releaseVariantDefaultApiPublication]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
+sample.gradle_max:AndroidOnly_kgp_snapshot_agp_max:1.0 => [releaseVariantDefaultApiPublication]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt
similarity index 72%
rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt
index 6d162b2..7231eef 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt
@@ -3,7 +3,7 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxArm64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-linuxarm64:1.0 => [linuxArm64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt
similarity index 72%
rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt
index 3a3f188..7985178 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt
@@ -3,7 +3,7 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxX64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-linuxx64:1.0 => [linuxX64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt
similarity index 72%
rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt
index d60b586..986eb02 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt
@@ -5,8 +5,8 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [releaseApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-android:1.0 => [releaseApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:AndroidOnly_kgp_snapshot_agp_max:1.0 => [releaseVariantDefaultApiPublication]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
+sample.gradle_max:AndroidOnly_kgp_snapshot_agp_max:1.0 => [releaseVariantDefaultApiPublication]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/jvmCompileClasspath.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_android_kgp_snapshot_agp_max/jvmCompileClasspath.txt
similarity index 75%
rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/jvmCompileClasspath.txt
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_android_kgp_snapshot_agp_max/jvmCompileClasspath.txt
index ce86bc9..27ee5ed 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/jvmCompileClasspath.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_android_kgp_snapshot_agp_max/jvmCompileClasspath.txt
@@ -2,5 +2,5 @@
project :kmp_native_jvm_android_kgp_snapshot_agp_max => [jvmCompileClasspath]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-jvm:1.0 => [jvmApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [jvmApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [jvmApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [jvmApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt
similarity index 72%
rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt
index 8adf384..e385f6d 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt
@@ -3,7 +3,7 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxArm64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-linuxarm64:1.0 => [linuxArm64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt
similarity index 72%
rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt
index d34e220..cb80010 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt
@@ -3,7 +3,7 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxX64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-linuxx64:1.0 => [linuxX64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_kgp_snapshot/jvmCompileClasspath.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_kgp_snapshot/jvmCompileClasspath.txt
index 50e67d7..e5b6bbf 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_kgp_snapshot/jvmCompileClasspath.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_kgp_snapshot/jvmCompileClasspath.txt
@@ -5,8 +5,8 @@
sample.gradle_6_8_3:kmp_native_jvm_kgp_snapshot:1.0 => [jvmApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-jvm:1.0 => [jvmApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [jvmApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [jvmApiElements-published]
sample.gradle_max:JavaOnly:1.0 => [apiElements]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [jvmApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot-jvm:1.0 => [jvmApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot:1.0 => [jvmApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_kgp_snapshot/linuxArm64CompileKlibraries.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_kgp_snapshot/linuxArm64CompileKlibraries.txt
index 7f91bf1..3c12994 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_kgp_snapshot/linuxArm64CompileKlibraries.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_kgp_snapshot/linuxArm64CompileKlibraries.txt
@@ -5,9 +5,9 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxArm64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-linuxarm64:1.0 => [linuxArm64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot-linuxarm64:1.0 => [linuxArm64ApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot:1.0 => [linuxArm64ApiElements-published]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_kgp_snapshot/linuxX64CompileKlibraries.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_kgp_snapshot/linuxX64CompileKlibraries.txt
index 351f87d..e5fbf7f 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_kgp_snapshot/linuxX64CompileKlibraries.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_max/kmp_native_jvm_kgp_snapshot/linuxX64CompileKlibraries.txt
@@ -5,9 +5,9 @@
sample.gradle_7_2:kmp_native_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxX64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3-linuxx64:1.0 => [linuxX64ApiElements-published]
sample.gradle_7_2:kmp_native_jvm_android_kgp_snapshot_agp_7_1_3:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_6:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
+sample.gradle_max:kmp_native_jvm_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot-linuxx64:1.0 => [linuxX64ApiElements-published]
sample.gradle_max:kmp_native_jvm_kgp_snapshot:1.0 => [linuxX64ApiElements-published]
