[Gradle] Run tests against Gradle 8.3

^KT-59024 Verification Pending

libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts

@@ -218,7 +218,7 @@ fun Test.includeTestsWithPattern(include: Boolean, patterns: (MutableSet<String>
 }
 
 fun Test.advanceGradleVersion() {
-    val gradleVersionForTests = "8.2.1"
+    val gradleVersionForTests = "8.3"
     systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests)
 }
 

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

@@ -27,7 +27,6 @@ class ConfigurationAvoidanceIT : KGPBaseTest() {
     @JvmGradlePluginTests
     @GradleTestVersions(
         additionalVersions = [TestVersions.Gradle.G_7_3],
-        maxVersion = TestVersions.Gradle.G_8_3
     )
     @DisplayName("KGP/Jvm does not eagerly configure any tasks")
     @GradleTest

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

@@ -17,7 +17,7 @@ class JavaUpToDateIT : KGPBaseTest() {
     @GradleTest
     fun testKotlinMethodBodyIsChanged(gradleVersion: GradleVersion) {
         project("javaUpToDate", gradleVersion) {
-            build("build") {
+            build("testClasses") {
                 assertTasksExecuted(
                     ":compileKotlin",
                     ":compileJava",
@@ -33,7 +33,7 @@ class JavaUpToDateIT : KGPBaseTest() {
                 )
             }
 
-            build("build") {
+            build("testClasses") {
                 assertTasksExecuted(":compileKotlin")
                 assertTasksUpToDate(":compileJava", ":compileTestJava", ":compileTestKotlin")
             }
@@ -44,7 +44,7 @@ class JavaUpToDateIT : KGPBaseTest() {
     @GradleTest
     fun testKotlinNewLineAdded(gradleVersion: GradleVersion) {
         project("javaUpToDate", gradleVersion) {
-            build("build") {
+            build("testClasses") {
                 assertTasksExecuted(
                     ":compileKotlin",
                     ":compileJava",
@@ -55,7 +55,7 @@ class JavaUpToDateIT : KGPBaseTest() {
 
             kotlinSourcesDir().resolve("foo/MainKotlinClass.kt").modify { "\n$it" }
 
-            build("build") {
+            build("testClasses") {
                 assertTasksExecuted(":compileKotlin")
                 assertTasksUpToDate(":compileJava", ":compileTestJava", ":compileTestKotlin")
             }
@@ -66,7 +66,7 @@ class JavaUpToDateIT : KGPBaseTest() {
     @GradleTest
     fun testPrivateMethodSignatureChanged(gradleVersion: GradleVersion) {
         project("javaUpToDate", gradleVersion) {
-            build("build") {
+            build("testClasses") {
                 assertTasksExecuted(
                     ":compileKotlin",
                     ":compileJava",
@@ -82,7 +82,7 @@ class JavaUpToDateIT : KGPBaseTest() {
                 )
             }
 
-            build("build") {
+            build("testClasses") {
                 // see https://github.com/gradle/gradle/issues/5013
                 assertTasksExecuted(":compileKotlin", ":compileJava", ":compileTestKotlin", ":compileTestJava")
             }

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

@@ -782,8 +782,7 @@ class Kotlin2JsIrGradlePluginIT : KGPBaseTest() {
     @GradleTest
     fun testCompilerTestAccessInternalProduction(gradleVersion: GradleVersion) {
         project("kotlin2JsInternalTest", gradleVersion) {
-            build("build") {
-            }
+            build("compileTestDevelopmentExecutableKotlinJs")
         }
     }
 

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

@@ -214,6 +214,7 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
             TestVersions.Gradle.G_7_6,
             TestVersions.Gradle.G_8_0,
             TestVersions.Gradle.G_8_1,
+            TestVersions.Gradle.G_8_2,
         ],
     )
     @GradleTest
@@ -221,6 +222,7 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
         project("kotlinProject", gradleVersion) {
             build("help") {
                 val expectedVariant = when (gradleVersion) {
+                    GradleVersion.version(TestVersions.Gradle.G_8_3) -> "gradle82"
                     GradleVersion.version(TestVersions.Gradle.G_8_2) -> "gradle82"
                     GradleVersion.version(TestVersions.Gradle.G_8_1) -> "gradle81"
                     GradleVersion.version(TestVersions.Gradle.G_8_0) -> "gradle80"

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

@@ -142,7 +142,7 @@ class SubpuginsIT : KGPBaseTest() {
     @GradleTest
     fun testAllOpenFromNestedBuildscript(gradleVersion: GradleVersion) {
         project("allOpenFromNestedBuildscript", gradleVersion) {
-            build("build") {
+            build("testClasses") {
                 val nestedSubproject = subProject("a/b")
                 assertFileExists(nestedSubproject.kotlinClassesDir().resolve("MyClass.class"))
                 assertFileExists(nestedSubproject.kotlinClassesDir("test").resolve("MyTestClass.class"))
@@ -155,7 +155,7 @@ class SubpuginsIT : KGPBaseTest() {
     @GradleTest
     fun testAllopenFromScript(gradleVersion: GradleVersion) {
         project("allOpenFromScript", gradleVersion) {
-            build("build") {
+            build("testClasses") {
                 assertFileExists(kotlinClassesDir().resolve("MyClass.class"))
                 assertFileExists(kotlinClassesDir(sourceSet = "test").resolve("MyTestClass.class"))
             }

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

@@ -52,10 +52,9 @@ class KotlinAndroidIT : KGPBaseTest() {
                 }
             }
 
-            build("assembleDebug", "test") {
-                val pattern = ":Test:compile[\\w\\d]+Kotlin"
-                expectedTasks.addAll(findTasksByPattern(pattern.toRegex()))
-                assertTasksExecuted(expectedTasks)
+            build("assembleDebug", ":Android:test") {
+                val pattern = ":Android:compile[\\w\\d]+Kotlin".toRegex()
+                assertTasksExecuted(expectedTasks + tasks.map { it.path }.filter { it.matches(pattern) })
                 assertOutputContains("InternalDummyTest PASSED")
                 assertKotlinGradleBuildServicesAreInitialized()
             }

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

@@ -842,14 +842,12 @@ class KotlinAndroidMppIT : KGPBaseTest() {
             buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion),
             buildJdk = jdkVersion.location
         ) {
-            build("allTests") {
+            build(":compileDebugUnitTestKotlinAndroid", ":compileReleaseUnitTestKotlinAndroid") {
                 assertTasksExecuted(
                     ":compileDebugKotlinAndroid",
                     ":compileReleaseKotlinAndroid",
                     ":compileDebugUnitTestKotlinAndroid",
                     ":compileReleaseUnitTestKotlinAndroid",
-                    ":testDebugUnitTest",
-                    ":testReleaseUnitTest",
                 )
             }
 

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

@@ -32,7 +32,7 @@ interface TestVersions {
         
         const val MIN_SUPPORTED = minSupportedGradleVersion
         const val MIN_SUPPORTED_KPM = G_7_0
-        const val MAX_SUPPORTED = G_8_2
+        const val MAX_SUPPORTED = G_8_3
     }
 
     object Kotlin {