[Gradle] Don't suggest to apply Kotlin compose plugin for an AGP version above 8.5.0

AGP 8.5.0 has introduced the own suggestion to apply the required Kotlin
 compose compiler plugin.

^KT-69444 Verification Pending

Author: Tapchicoma

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ComposeIT.kt

@@ -66,6 +66,71 @@ class ComposeIT : KGPBaseTest() {
         }
     }
 
+    @DisplayName("Should conditionally suggest to migrate to new compose plugin")
+    @AndroidTestVersions(
+        maxVersion = TestVersions.AGP.AGP_86,
+        additionalVersions = [TestVersions.AGP.AGP_85]
+    )
+    @AndroidGradlePluginTests
+    @GradleAndroidTest
+    @TestMetadata("AndroidSimpleApp")
+    fun testAndroidComposeSuggestion(
+        gradleVersion: GradleVersion,
+        agpVersion: String,
+        providedJdk: JdkVersions.ProvidedJdk
+    ) {
+        project(
+            projectName = "AndroidSimpleApp",
+            gradleVersion = gradleVersion,
+            buildJdk = providedJdk.location,
+            buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion)
+        ) {
+            buildGradle.modify { originalBuildScript ->
+                """
+                |$originalBuildScript
+                |
+                |dependencies {
+                |    implementation "androidx.compose.runtime:runtime:1.6.4"
+                |}
+                |
+                |android.buildFeatures.compose = true
+                |
+                """.trimMargin()
+            }
+
+            gradleProperties.appendText(
+                """
+                android.useAndroidX=true
+                """.trimIndent()
+            )
+
+            buildAndFail("assembleDebug") {
+                when (agpVersion) {
+                    TestVersions.AgpCompatibilityMatrix.AGP_71.version,
+                    TestVersions.AgpCompatibilityMatrix.AGP_72.version,
+                    TestVersions.AgpCompatibilityMatrix.AGP_73.version,
+                    TestVersions.AgpCompatibilityMatrix.AGP_74.version,
+                    TestVersions.AgpCompatibilityMatrix.AGP_80.version,
+                    TestVersions.AgpCompatibilityMatrix.AGP_81.version,
+                    TestVersions.AgpCompatibilityMatrix.AGP_82.version,
+                    TestVersions.AgpCompatibilityMatrix.AGP_83.version,
+                    TestVersions.AgpCompatibilityMatrix.AGP_84.version,
+                        -> {
+                        assertOutputContains(APPLY_COMPOSE_SUGGESTION)
+                    }
+                    else -> {
+                        // This error should come from AGP side
+                        assertOutputContains(
+                            "Starting in Kotlin 2.0, the Compose Compiler Gradle plugin is required\n" +
+                                    "  when compose is enabled. See the following link for more information:\n" +
+                                    "  https://d.android.com/r/studio-ui/compose-compiler\n"
+                        )
+                    }
+                }
+            }
+        }
+    }
+
     @DisplayName("Should work correctly when compose in Android is enabled")
     @AndroidGradlePluginTests
     @GradleAndroidTest

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/checkers/ComposePluginSuggestApplyChecker.kt

@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers
 
 import org.gradle.api.Project
 import org.gradle.api.plugins.PluginContainer
+import org.jetbrains.kotlin.gradle.plugin.AndroidGradlePluginVersion
 import org.jetbrains.kotlin.gradle.plugin.KotlinPluginLifecycle
 import org.jetbrains.kotlin.gradle.plugin.diagnostics.*
 import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinGradleProjectChecker
@@ -18,14 +19,20 @@ internal object ComposePluginSuggestApplyChecker : KotlinGradleProjectChecker {
     override suspend fun KotlinGradleProjectCheckerContext.runChecks(collector: KotlinToolingDiagnosticsCollector) {
         project.kotlinPluginLifecycle.await(KotlinPluginLifecycle.Stage.AfterFinaliseDsl)
 
+        // 'kotlin-android' project with AGP <8.5.0 where Compose enabled, but no Kotlin Compose Gradle plugin is used
         if (project.plugins.hasKotlinAndroidPlugin() &&
+            !isAgp850AndAbove &&
             project.isAgpComposeEnabled &&
             !project.plugins.hasKotlinComposePlugin()
         ) {
             collector.reportSuggestion(project)
-        } else if (project.plugins.hasKotlinMultiplatformPlugin() &&
+        } else if (
+        // KMP project without Jetbrains Compose plugin, but with AGP <8.5.0 where Compose enabled,
+        // and no Kotlin Compose Gradle plugin is used
+            project.plugins.hasKotlinMultiplatformPlugin() &&
             !project.plugins.hasJetBrainsComposePlugin() &&
             project.isAgpComposeEnabled &&
+            !isAgp850AndAbove &&
             !project.plugins.hasKotlinComposePlugin()
         ) {
             collector.reportSuggestion(project)
@@ -55,4 +62,6 @@ internal object ComposePluginSuggestApplyChecker : KotlinGradleProjectChecker {
     private val Project.agpComposeConfiguration get() = configurations.findByName("kotlin-extension")
 
     private val Project.isAgpComposeEnabled get() = agpComposeConfiguration != null
+
+    private val isAgp850AndAbove get() = AndroidGradlePluginVersion.current >= AndroidGradlePluginVersion(8, 5, 0)
 }