[Gradle][Tests][MPP] Use MAX_SUPPORTED AGP/Gradle versions for MPP tests

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

@@ -224,7 +224,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
     }
 
     @JvmGradlePluginTests
-    @DisplayName("with build build scan report")
+    @DisplayName("with build scan report")
     @GradleTest
     fun testBuildScanReportSmokeTestForConfigurationCache(gradleVersion: GradleVersion) {
         project("simpleProject", gradleVersion) {

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

@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.gradle
 import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.com.google.common.base.Objects
 import org.jetbrains.kotlin.gradle.GradleVersionRequired.Companion.OLDEST_SUPPORTED
+import org.jetbrains.kotlin.gradle.testbase.TestVersions
 import org.jetbrains.kotlin.gradle.utils.minSupportedGradleVersion
 import org.junit.Assume
 
@@ -26,7 +27,7 @@ sealed class GradleVersionRequired(val minVersion: String, val maxVersion: Strin
     companion object {
         const val OLDEST_SUPPORTED = minSupportedGradleVersion
 
-        val FOR_MPP_SUPPORT = AtLeast(OLDEST_SUPPORTED)
+        val FOR_MPP_SUPPORT = AtLeast(TestVersions.Gradle.MAX_SUPPORTED)
     }
 
     class Exact(version: String) : GradleVersionRequired(version, version) {

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

@@ -71,6 +71,7 @@ class KotlinAndroidMppIT : KGPBaseTest() {
         
                 android {
                     compileSdkVersion 22
+                    namespace 'org.jetbrains.kotlin.gradle.test.android.libalfa'
                 }
         
                 kotlin { android("android") { } }
@@ -129,7 +130,6 @@ class KotlinAndroidMppIT : KGPBaseTest() {
 
     @DisplayName("mpp source sets are registered in AGP")
     @GradleAndroidTest
-    @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
     fun testAndroidMppSourceSets(
         gradleVersion: GradleVersion,
         agpVersion: String,
@@ -540,10 +540,7 @@ class KotlinAndroidMppIT : KGPBaseTest() {
         }
     }
 
-    // AGP max version is limited due to https://youtrack.jetbrains.com/issue/KT-51940/HMPP-resolves-configurations-during-configuration
     @DisplayName("android app can depend on mpp lib")
-    @AndroidTestVersions(maxVersion = TestVersions.AGP.AGP_72)
-    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_4) // due AGP version limit ^
     @GradleAndroidTest
     fun testAndroidWithNewMppApp(
         gradleVersion: GradleVersion,
@@ -726,7 +723,10 @@ class KotlinAndroidMppIT : KGPBaseTest() {
                 appBuildScriptBackup +
                         //language=Gradle
                         """
-
+                            
+                        android {
+                            namespace 'app.example.com.lib'
+                        }
                         kotlin.targets.all {
                             compilations.all {
                                 attributes.attribute(
@@ -741,7 +741,10 @@ class KotlinAndroidMppIT : KGPBaseTest() {
                 appBuildScriptBackup +
                         //language=Gradle
                         """
-
+                            
+                        android {
+                            namespace 'app.example.com.app_sample'
+                        }
                         kotlin.targets.androidApp.compilations.all {
                             attributes.attribute(
                                 Attribute.of("com.example.compilation", String),

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

@@ -28,7 +28,8 @@ class AppleFrameworkIT : BaseGradleIT() {
     override val defaultGradleVersion = GradleVersionRequired.FOR_MPP_SUPPORT
     override fun defaultBuildOptions() = super.defaultBuildOptions().copy(
         androidHome = KtTestUtil.findAndroidSdk(),
-        androidGradlePluginVersion = AGPVersion.v4_2_0
+        androidGradlePluginVersion = AGPVersion.v7_4_0,
+        javaHome = KtTestUtil.getJdk17Home()
     )
 
     @Test

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

@@ -98,7 +98,6 @@ class AppleSiliconIT : BaseGradleIT() {
 
                 val x64Tests = listOf(
                     ":iosX64Test",
-                    ":jvmTest",
                     ":macosX64Test",
                     ":tvosX64Test",
                     ":watchosX64Test",

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

@@ -28,7 +28,8 @@ class XCFrameworkIT : BaseGradleIT() {
     override val defaultGradleVersion = GradleVersionRequired.FOR_MPP_SUPPORT
     override fun defaultBuildOptions() = super.defaultBuildOptions().copy(
         androidHome = KtTestUtil.findAndroidSdk(),
-        androidGradlePluginVersion = AGPVersion.v4_2_0
+        androidGradlePluginVersion = AGPVersion.v7_4_0,
+        javaHome = KtTestUtil.getJdk17Home()
     )
 
     @Test

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

@@ -22,7 +22,7 @@ interface TestVersions {
         const val G_7_6 = "7.6"
         // https://gradle.org/nightly/
         // Retention policy is 3 months
-        const val G_8_0 = "8.0-rc-1"
+        const val G_8_0 = "8.0.2"
         const val MIN_SUPPORTED = minSupportedGradleVersion
         const val MIN_SUPPORTED_KPM = G_7_0
         const val MAX_SUPPORTED = G_7_6