[Gradle] Update AGP versions in tests and set max to '8.4.0'

^KT-68242 Fixed
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 990d4b6..e0fa742 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
@@ -25,7 +25,7 @@
 @AndroidTestVersions(
     minVersion = TestVersions.AGP.AGP_82,
     maxVersion = TestVersions.AGP.AGP_85,
-    additionalVersions = [TestVersions.AGP.AGP_84],
+    additionalVersions = [TestVersions.AGP.AGP_83, TestVersions.AGP.AGP_84],
 )
 @AndroidGradlePluginTests
 class ExternalAndroidTargetIT : KGPBaseTest() {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/publication/MppPublicationCompatibilityIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/publication/MppPublicationCompatibilityIT.kt
index 8c6316f..d0ab9e1 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/publication/MppPublicationCompatibilityIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/publication/MppPublicationCompatibilityIT.kt
@@ -11,6 +11,7 @@
 import org.jetbrains.kotlin.gradle.util.replaceText
 import org.jetbrains.kotlin.gradle.util.x
 import org.jetbrains.kotlin.test.KotlinTestUtils
+import org.jetbrains.kotlin.test.TestMetadata
 import org.jetbrains.kotlin.utils.addIfNotNull
 import org.junit.jupiter.api.DisplayName
 import org.junit.runners.model.MultipleFailureException
@@ -89,9 +90,11 @@
         return scenarios
     }
 
+    // Test data could be regenerated by removing subdirectories in "expectedData" directory in the project dir
     @DisplayName("test compatibility between published libraries by kotlin multiplatform, java and android")
     @GradleTest
     @GradleTestVersions(minVersion = TestVersions.Gradle.MAX_SUPPORTED, maxVersion = TestVersions.Gradle.MAX_SUPPORTED)
+    @TestMetadata("mppPublicationCompatibility")
     @MppGradlePluginTests
     fun testKmpPublication() {
         val scenarios = generateScenarios()
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 8a37997..528c8cb 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
@@ -52,15 +52,16 @@
         const val AGP_73 = "7.3.1"
         const val AGP_74 = "7.4.2"
         const val AGP_80 = "8.0.2"
-        const val AGP_81 = "8.1.3"
-        const val AGP_82 = "8.2.0"
-        const val AGP_83 = "8.3.1"
-        const val AGP_84 = "8.4.0-beta01"
-        const val AGP_85 = "8.5.0-alpha02"
+        const val AGP_81 = "8.1.4"
+        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"
 
         // Should be in sync with KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck
         const val MIN_SUPPORTED = AGP_71 // KotlinAndroidPlugin.minimalSupportedAgpVersion
-        const val MAX_SUPPORTED = AGP_83 // Update once Gradle MAX_SUPPORTED version will be bumped
+        const val MAX_SUPPORTED = AGP_84 // Update once Gradle MAX_SUPPORTED version will be bumped
     }
 
     enum class AgpCompatibilityMatrix(
@@ -77,8 +78,9 @@
         AGP_81(AGP.AGP_81, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17),
         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_4), GradleVersion.version(Gradle.G_8_7), JavaVersion.VERSION_17),
-        AGP_85(AGP.AGP_85, GradleVersion.version(Gradle.G_8_5), 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),
         ;
     }
 
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 26ac03b..ee39044 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_4:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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_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 e252bdc..50e67d7 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_4:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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_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 559acb7..7f91bf1 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_4:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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_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 af53ac9..351f87d 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_4:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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_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 48c6b94..aac426e 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_4:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
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 a35edd8..42d24df 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_4:AndroidOnly_kgp_snapshot_agp_max:1.0 => [releaseVariantDefaultApiPublication]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
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 b00a074..110d12c 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_4:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
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 b348daf..da21ff8 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_4:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
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 32a67a6..fcd047b 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_4:AndroidOnly_kgp_snapshot_agp_max:1.0 => [releaseVariantDefaultApiPublication]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
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 8090657..990854f 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_4:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
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 2ac30c62..3af885c 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_4:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
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 12c4f28..38262ec 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_4:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/AndroidOnly_kgp_snapshot_agp_max/releaseCompileClasspath.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/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_4/AndroidOnly_kgp_snapshot_agp_max/releaseCompileClasspath.txt
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/AndroidOnly_kgp_snapshot_agp_max/releaseCompileClasspath.txt
index 8e11b98..89ec462 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/AndroidOnly_kgp_snapshot_agp_max/releaseCompileClasspath.txt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_6/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_4:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4/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_8_6/kmp_native_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt
index 7f6b75e..fd8d7f3 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4:AndroidOnly_kgp_snapshot_agp_max:1.0 => [releaseVariantDefaultApiPublication]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4/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_8_6/kmp_native_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt
index 8b163c4..6d162b2 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4/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_8_6/kmp_native_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt
index 06432b6..3a3f188 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4/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_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/androidReleaseCompileClasspath.txt
index b8a4896..d60b586 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4:AndroidOnly_kgp_snapshot_agp_max:1.0 => [releaseVariantDefaultApiPublication]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-android:1.0 => [releaseApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4/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_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/jvmCompileClasspath.txt
index 5dafee2..ce86bc9 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4/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_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxArm64CompileKlibraries.txt
index 430e5bf..8adf384 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4/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_8_6/kmp_native_jvm_android_kgp_snapshot_agp_max/linuxX64CompileKlibraries.txt
index d219e86..d34e220 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppPublicationCompatibility/expectedData/sample.gradle_8_4/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_8_6/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_4:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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]
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 26ac03b..ee39044 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_4:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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_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/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 e252bdc..50e67d7 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_4:kmp_native_jvm_android_kgp_snapshot_agp_max-jvm:1.0 => [jvmApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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_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 559acb7..7f91bf1 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_4:kmp_native_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxarm64:1.0 => [linuxArm64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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_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 af53ac9..351f87d 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_4:kmp_native_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_android_kgp_snapshot_agp_max:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max-linuxx64:1.0 => [linuxX64ApiElements-published]
-sample.gradle_8_4:kmp_native_jvm_android_kgp_snapshot_agp_max: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_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/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck.kt
index 3155295..7994c27 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck.kt
@@ -21,7 +21,7 @@
 
     val compatibleAndroidGradlePluginVersionRange = AndroidGradlePluginVersionRange(
         minSupportedVersion = AndroidGradlePluginVersionRange.Version(7, 1),
-        maxSupportedVersion = AndroidGradlePluginVersionRange.Version(8, 3)
+        maxSupportedVersion = AndroidGradlePluginVersionRange.Version(8, 4)
     )
 
     /**