Update IntelliJ Platform Gradle Plugin to 2.0.0 (#4704)

Author: rli

buildSrc/src/main/kotlin/temp-toolkit-intellij-root-conventions.gradle.kts

@@ -73,7 +73,6 @@ dependencies {
         create(type, version, useInstaller = false)
     }
 
-    implementation(project(":plugin-toolkit:jetbrains-core"))
     implementation(project(":plugin-toolkit:jetbrains-ultimate"))
     project.findProject(":plugin-toolkit:jetbrains-gateway")?.let {
         // does this need to be the instrumented variant?
@@ -85,11 +84,6 @@ dependencies {
     resharperDlls(project(":plugin-toolkit:jetbrains-rider", configuration = "resharperDlls"))
 }
 
-// Enable coverage for the UI test target IDE
-ciOnly {
-    extensions.getByType<JacocoPluginExtension>().applyTo(tasks.withType<TestIdeUiTask>())
-}
-
 tasks.withType<TestIdeUiTask>().configureEach {
     systemProperty("robot-server.port", remoteRobotPort)
     // mac magic

buildSrc/src/main/kotlin/toolkit-integration-testing.gradle.kts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import org.jetbrains.intellij.platform.gradle.Constants.Configurations.Attributes
+import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformTestingExtension
 import software.aws.toolkits.gradle.ciOnly
 import software.aws.toolkits.gradle.findFolders
 import software.aws.toolkits.gradle.intellij.IdeVersions
@@ -58,12 +59,11 @@ idea {
         testResourceDirs = testResourceDirs + integrationTests.resources.srcDirs
     }
 }
-
-val integTestTask = tasks.register<Test>("integrationTest") {
+val integrationTestConfiguration: Test.() -> Unit = {
     group = LifecycleBasePlugin.VERIFICATION_GROUP
     description = "Runs the integration tests."
     testClassesDirs = integrationTests.output.classesDirs
-    classpath = integrationTests.runtimeClasspath
+    classpath += integrationTests.runtimeClasspath
 
     ciOnly {
         environment.remove("AWS_ACCESS_KEY_ID")
@@ -74,15 +74,16 @@ val integTestTask = tasks.register<Test>("integrationTest") {
     mustRunAfter(tasks.test)
 }
 
-tasks.check {
-    dependsOn(integrationTests.compileJavaTaskName, integrationTests.getCompileTaskName("kotlin"))
-}
-
-afterEvaluate {
-    plugins.withType<ToolkitIntellijSubpluginPlugin>().configureEach {
-        // intellij plugin overrides with instrumented classes that we don't want or need
-        integTestTask.configure {
-            testClassesDirs = integrationTests.output.classesDirs
+extensions.findByType<IntelliJPlatformTestingExtension>()?.let {
+    val integrationTest by it.testIde.registering {
+        task {
+            integrationTestConfiguration(this)
         }
     }
+} ?: run {
+    val integrationTest by tasks.registering(Test::class, integrationTestConfiguration)
+}
+
+tasks.check {
+    dependsOn(integrationTests.compileJavaTaskName, integrationTests.getCompileTaskName("kotlin"))
 }

buildSrc/src/main/kotlin/toolkit-intellij-plugin.gradle.kts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
-import org.jetbrains.intellij.platform.gradle.tasks.aware.TestableAware
+import org.jetbrains.intellij.platform.gradle.tasks.aware.SandboxAware
 import software.aws.toolkits.gradle.ciOnly
 import software.aws.toolkits.gradle.intellij.ToolkitIntelliJExtension
 
@@ -34,10 +34,10 @@ dependencies {
 ciOnly {
     abstract class NoopBuildService : BuildService<BuildServiceParameters.None> {}
     val noopService = gradle.sharedServices.registerIfAbsent("noopService", NoopBuildService::class.java) {
-        maxParallelUsages = 4
+        maxParallelUsages = 2
     }
 
-    tasks.matching { it is TestableAware }.configureEach {
+    tasks.matching { it is Test || it is SandboxAware }.configureEach {
         usesService(noopService)
     }
 }

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ awsSdk = "2.26.25"
 commonmark = "0.22.0"
 detekt = "1.23.6"
 intellijExt = "1.1.8"
-intellijGradle = "2.0.0-beta9"
+intellijGradle = "2.0.0"
 intellijRemoteRobot = "0.11.22"
 jackson = "2.16.1"
 jacoco = "0.8.12"

plugins/toolkit/intellij-standalone/build.gradle.kts

@@ -1,7 +1,5 @@
 // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import org.jetbrains.intellij.platform.gradle.Constants.Tasks
-import org.jetbrains.intellij.platform.gradle.tasks.PatchPluginXmlTask
 import software.aws.toolkits.gradle.findFolders
 import software.aws.toolkits.gradle.intellij.IdeVersions
 
@@ -23,15 +21,10 @@ intellijPlatform {
 dependencies {
     intellijPlatform {
         localPlugin(project(":plugin-core"))
+        pluginModule(project(":plugin-toolkit:jetbrains-core"))
     }
 }
 
-tasks.jarSearchableOptions {
-    dependsOn(":plugin-toolkit:jetbrains-core:${Tasks.PATCH_PLUGIN_XML}")
-
-    pluginXml.set(project(":plugin-toolkit:jetbrains-core").tasks.maybeCreate<PatchPluginXmlTask>(Tasks.PATCH_PLUGIN_XML).outputFile)
-}
-
 tasks.check {
     val serviceSubdirs = project(":plugin-toolkit").subprojects
         .map { it.name }.filter { it != "intellij" }.filter { it != "intellij-standalone" }

plugins/toolkit/jetbrains-gateway/build.gradle.kts

@@ -4,7 +4,6 @@
 
 import net.bytebuddy.utility.RandomString
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
-import org.jetbrains.intellij.platform.gradle.tasks.PatchPluginXmlTask
 import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
 import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated
 import software.aws.toolkits.gradle.intellij.IdeFlavor
@@ -51,6 +50,7 @@ val gatewayOnlyResourcesJar by tasks.registering(Jar::class) {
 
 listOf(
     "intellijPlatformDependency",
+    "intellijPlatformDependency_integrationTest",
     "intellijPluginVerifierIdesDependency",
 ).forEach { configurationName ->
     configurations[configurationName].dependencies.addLater(
@@ -66,14 +66,15 @@ listOf(
 
 dependencies {
     intellijPlatform {
+        pluginModule(project(":plugin-toolkit:jetbrains-core", "gatewayArtifacts"))
+
         pluginVerifier()
 
         testFramework(TestFrameworkType.Bundled)
     }
 
-    // link against :j-c: and rely on :intellij:buildPlugin to pull in :j-c:instrumentedJar, but gateway variant when runIde/buildPlugin from :jetbrains-gateway
+    // link against :j-c: and rely on :intellij-standalone:composeJar to pull in :j-c:instrumentedJar, but gateway variant when from :jetbrains-gateway
     compileOnly(project(":plugin-toolkit:jetbrains-core"))
-    gatewayOnlyRuntimeOnly(project(":plugin-toolkit:jetbrains-core", "gatewayArtifacts"))
     // delete when fully split
     gatewayOnlyRuntimeOnly(project(":plugin-core:core"))
     gatewayOnlyRuntimeOnly(project(":plugin-core:jetbrains-community"))
@@ -162,12 +163,6 @@ listOf(
     }
 }
 
-tasks.jarSearchableOptions {
-    dependsOn(":plugin-toolkit:jetbrains-core:pluginXmlForGateway")
-
-    pluginXml.set(project(":plugin-toolkit:jetbrains-core").tasks.maybeCreate<PatchPluginXmlTask>("pluginXmlForGateway").outputFile)
-}
-
 tasks.buildPlugin {
     val classifier = if (archiveClassifier.get().isNullOrBlank()) {
         "GW"