Upgrade IntelliJ Platform Gradle Plugin to 2.0

.gitignore

@@ -1,4 +1,5 @@
 .gradle
+.intellijPlatform
 out/
 target/
 .idea

build.gradle.kts

@@ -32,7 +32,7 @@ allprojects {
     configurations.all {
         resolutionStrategy {
             failOnDynamicVersions()
-            failOnChangingVersions()
+//            failOnChangingVersions()
         }
     }
 }

buildSrc/build.gradle.kts

@@ -22,6 +22,7 @@ dependencies {
     implementation(libs.bundles.jackson)
     implementation(libs.commonmark)
     implementation(libs.gradlePlugin.detekt)
+    implementation(libs.gradlePlugin.ideaExt)
     implementation(libs.gradlePlugin.intellij)
     implementation(libs.gradlePlugin.kotlin)
     implementation(libs.gradlePlugin.testLogger)

buildSrc/settings.gradle.kts

@@ -40,8 +40,7 @@ dependencyResolutionManagement {
             url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
             content {
                 // only allowed to pull snapshots of gradle-intellij-plugin from here
-                includeModule("org.jetbrains.intellij", "org.jetbrains.intellij.gradle.plugin")
-                includeModule("org.jetbrains.intellij.plugins", "gradle-intellij-plugin")
+                includeGroupByRegex("org\\.jetbrains\\.intellij\\.platform.*")
             }
         }
     }

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -11,8 +11,8 @@ import org.gradle.api.provider.ProviderFactory
 enum class IdeFlavor { GW, IC, IU, RD }
 
 object IdeVersions {
-    private val commonPlugins = arrayOf(
-        "vcs-git",
+    private val commonPlugins = listOf(
+        "Git4Idea",
         "org.jetbrains.plugins.terminal",
         "org.jetbrains.plugins.yaml"
     )
@@ -23,76 +23,70 @@ object IdeVersions {
             community = ProductProfile(
                 sdkFlavor = IdeFlavor.IC,
                 sdkVersion = "2023.2.2",
-                plugins = commonPlugins + listOf(
-                    "java",
+                bundledPlugins = commonPlugins + listOf(
+                    "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
+                ),
+                marketplacePlugins = listOf(
                     "PythonCore:232.8660.185",
                     "Docker:232.8660.185"
                 )
             ),
             ultimate = ProductProfile(
                 sdkFlavor = IdeFlavor.IU,
                 sdkVersion = "2023.2.2",
-                plugins = commonPlugins + listOf(
+                bundledPlugins = commonPlugins + listOf(
                     "JavaScript",
-                    // Transitive dependency needed for javascript
-                    // Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
-                    "com.intellij.css",
                     "JavaScriptDebugger",
                     "com.intellij.database",
                     "com.jetbrains.codeWithMe",
+                ),
+                marketplacePlugins = listOf(
                     "Pythonid:232.8660.185",
                     "org.jetbrains.plugins.go:232.8660.142",
-                    // https://github.com/JetBrains/gradle-intellij-plugin/issues/1056
-                    "org.intellij.intelliLang"
                 )
             ),
             rider = RiderProfile(
-                sdkVersion = "2023.2",
-                plugins = commonPlugins + listOf(
-                    "rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
-                ),
+                sdkVersion = "2023.2.5",
+                bundledPlugins = commonPlugins,
                 netFrameworkTarget = "net472",
                 rdGenVersion = "2023.2.3",
-                nugetVersion = "2023.2.0"
+                nugetVersion = "2023.2.5"
             )
         ),
         Profile(
             name = "2023.3",
             community = ProductProfile(
                 sdkFlavor = IdeFlavor.IC,
                 sdkVersion = "2023.3",
-                plugins = commonPlugins + listOf(
-                    "java",
+                bundledPlugins = commonPlugins + listOf(
+                    "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
+                ),
+                marketplacePlugins = listOf(
                     "PythonCore:233.11799.241",
                     "Docker:233.11799.244"
                 )
             ),
             ultimate = ProductProfile(
                 sdkFlavor = IdeFlavor.IU,
                 sdkVersion = "2023.3",
-                plugins = commonPlugins + listOf(
+                bundledPlugins = commonPlugins + listOf(
                     "JavaScript",
-                    // Transitive dependency needed for javascript
-                    // Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
-                    "com.intellij.css",
                     "JavaScriptDebugger",
                     "com.intellij.database",
                     "com.jetbrains.codeWithMe",
+                ),
+                marketplacePlugins = listOf(
                     "Pythonid:233.11799.241",
                     "org.jetbrains.plugins.go:233.11799.196",
-                    // https://github.com/JetBrains/gradle-intellij-plugin/issues/1056
-                    "org.intellij.intelliLang"
                 )
             ),
             rider = RiderProfile(
                 sdkVersion = "2023.3",
-                plugins = commonPlugins + listOf(
-                    "rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
-                ),
+                bundledPlugins = commonPlugins,
                 netFrameworkTarget = "net472",
                 rdGenVersion = "2023.3.2",
                 nugetVersion = "2023.3.0"
@@ -103,45 +97,38 @@ object IdeVersions {
             gateway = ProductProfile(
                 sdkFlavor = IdeFlavor.GW,
                 sdkVersion = "241.14494-EAP-CANDIDATE-SNAPSHOT",
-                plugins = arrayOf("org.jetbrains.plugins.terminal")
+                bundledPlugins = listOf("org.jetbrains.plugins.terminal")
             ),
             community = ProductProfile(
                 sdkFlavor = IdeFlavor.IC,
                 sdkVersion = "2024.1",
-                plugins = commonPlugins + listOf(
-                    "java",
+                bundledPlugins = commonPlugins + listOf(
+                    "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
-                    // transitive for python
-                    "org.toml.lang:241.14494.150",
+                ),
+                marketplacePlugins = listOf(
                     "PythonCore:241.14494.240",
                     "Docker:241.14494.251"
                 )
             ),
             ultimate = ProductProfile(
                 sdkFlavor = IdeFlavor.IU,
                 sdkVersion = "2024.1",
-                plugins = commonPlugins + listOf(
+                bundledPlugins = commonPlugins + listOf(
                     "JavaScript",
-                    // Transitive dependency needed for javascript
-                    // Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
-                    "com.intellij.css",
                     "JavaScriptDebugger",
                     "com.intellij.database",
                     "com.jetbrains.codeWithMe",
-                    // transitive for python
-                    "org.toml.lang:241.14494.150",
+                ),
+                marketplacePlugins = listOf(
                     "Pythonid:241.14494.314",
                     "org.jetbrains.plugins.go:241.14494.240",
-                    // https://github.com/JetBrains/gradle-intellij-plugin/issues/1056
-                    "org.intellij.intelliLang"
                 )
             ),
             rider = RiderProfile(
                 sdkVersion = "2024.1",
-                plugins = commonPlugins + listOf(
-                    "rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
-                ),
+                bundledPlugins = commonPlugins,
                 netFrameworkTarget = "net472",
                 rdGenVersion = "2024.1.1",
                 nugetVersion = "2024.1.0"
@@ -162,28 +149,18 @@ object IdeVersions {
 open class ProductProfile(
     val sdkFlavor: IdeFlavor,
     val sdkVersion: String,
-    val plugins: Array<String> = emptyArray()
-) {
-    fun version(): String? = if (!isLocalPath(sdkVersion)) {
-        sdkFlavor.name + "-" + sdkVersion
-    } else {
-        null
-    }
-
-    fun localPath(): String? = sdkVersion.takeIf {
-        isLocalPath(it)
-    }
-
-    private fun isLocalPath(str: String) = str.startsWith("/") || str.getOrNull(1) == ':'
-}
+    val bundledPlugins: List<String> = emptyList(),
+    val marketplacePlugins: List<String> = emptyList()
+)
 
 class RiderProfile(
     sdkVersion: String,
-    plugins: Array<String>,
     val netFrameworkTarget: String,
     val rdGenVersion: String, // https://central.sonatype.com/artifact/com.jetbrains.rd/rd-gen/2023.2.3/versions
-    val nugetVersion: String // https://www.nuget.org/packages/JetBrains.Rider.SDK/
-) : ProductProfile(IdeFlavor.RD, sdkVersion, plugins)
+    val nugetVersion: String, // https://www.nuget.org/packages/JetBrains.Rider.SDK/
+    bundledPlugins: List<String> = emptyList(),
+    marketplacePlugins: List<String> = emptyList(),
+) : ProductProfile(IdeFlavor.RD, sdkVersion, bundledPlugins, marketplacePlugins)
 
 class Profile(
     val name: String,

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/ToolkitIntelliJExtension.kt

@@ -15,12 +15,8 @@ abstract class ToolkitIntelliJExtension(private val providers: ProviderFactory)
 
     fun ideProfile() = IdeVersions.ideProfile(providers)
 
-    fun version(): Provider<String?> = productProfile().flatMap { profile ->
-        providers.provider { profile.version() }
-    }
-
-    fun localPath(): Provider<String?> = productProfile().flatMap { profile ->
-        providers.provider { profile.localPath() }
+    fun version(): Provider<String> = productProfile().flatMap { profile ->
+        providers.provider { profile.sdkVersion }
     }
 
     fun productProfile(): Provider<out ProductProfile> = ideFlavor.flatMap { flavor ->

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

@@ -1,32 +1,29 @@
 // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.invoke
 import org.gradle.kotlin.dsl.project
 import org.gradle.kotlin.dsl.provideDelegate
-import org.gradle.kotlin.dsl.withType
-import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
-import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
-import org.jetbrains.intellij.tasks.DownloadRobotServerPluginTask
-import org.jetbrains.intellij.tasks.RunIdeForUiTestTask
-import org.jetbrains.intellij.utils.OpenedPackages
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
+import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformExtension
+import org.jetbrains.intellij.platform.gradle.plugins.project.DownloadRobotServerPluginTask
+import org.jetbrains.intellij.platform.gradle.tasks.TestIdeUiTask
 import software.aws.toolkits.gradle.ciOnly
 import software.aws.toolkits.gradle.intellij.IdeFlavor
 import software.aws.toolkits.gradle.intellij.IdeVersions
 import software.aws.toolkits.gradle.intellij.ToolkitIntelliJExtension
+import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
 
 plugins {
-    id("org.jetbrains.intellij")
     id("toolkit-testing") // Needed so the coverage configurations are present
     id("toolkit-detekt")
     id("toolkit-publishing-conventions")
+    id("toolkit-publish-root-conventions")
 }
 
-val toolkitIntelliJ = project.extensions.create<ToolkitIntelliJExtension>("intellijToolkit").apply {
+toolkitIntelliJ.apply {
     val runIdeVariant = providers.gradleProperty("runIdeVariant")
     ideFlavor.set(IdeFlavor.values().firstOrNull { it.name == runIdeVariant.orNull } ?: IdeFlavor.IC)
 }
@@ -48,17 +45,14 @@ val gatewayResources = configurations.create("gatewayResources") {
     isCanBeConsumed = false
 }
 
-intellij {
-    pluginName.set("aws-toolkit-jetbrains")
-
-    localPath.set(toolkitIntelliJ.localPath())
-    version.set(toolkitIntelliJ.version())
-
-    updateSinceUntilBuild.set(false)
-    instrumentCode.set(false)
+intellijPlatform {
+    projectName = "aws-toolkit-jetbrains"
+    instrumentCode = false
 }
 
 tasks.prepareSandbox {
+    val pluginName = intellijPlatform.projectName
+
     intoChild(pluginName.map { "$it/dotnet" })
         .from(resharperDlls)
 
@@ -72,6 +66,13 @@ tasks.test {
 }
 
 dependencies {
+    intellijPlatform {
+        val type = toolkitIntelliJ.ideFlavor.map { IntelliJPlatformType.fromCode(it.toString()) }
+        val version = toolkitIntelliJ.version()
+
+        create(type, version)
+    }
+
     implementation(project(":plugin-toolkit:jetbrains-core"))
     implementation(project(":plugin-toolkit:jetbrains-ultimate"))
     project.findProject(":plugin-toolkit:jetbrains-gateway")?.let {
@@ -86,13 +87,10 @@ dependencies {
 
 // Enable coverage for the UI test target IDE
 ciOnly {
-    extensions.getByType<JacocoPluginExtension>().applyTo(tasks.withType<RunIdeForUiTestTask>())
-}
-tasks.withType<DownloadRobotServerPluginTask> {
-    // TODO: https://github.com/gradle/gradle/issues/15383
-    version.set(versionCatalogs.named("libs").findVersion("intellijRemoteRobot").get().requiredVersion)
+    extensions.getByType<JacocoPluginExtension>().applyTo(tasks.withType<TestIdeUiTask>())
 }
-tasks.withType<RunIdeForUiTestTask>().all {
+
+tasks.withType<TestIdeUiTask>().all {
     systemProperty("robot-server.port", remoteRobotPort)
     // mac magic
     systemProperty("ide.mac.message.dialogs.as.sheets", "false")
@@ -118,13 +116,6 @@ tasks.withType<RunIdeForUiTestTask>().all {
         suspend.set(false)
     }
 
-    jvmArgs(
-        OpenedPackages + listOf(
-            // very noisy in UI tests
-            "--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED",
-        )
-    )
-
     ciOnly {
         configure<JacocoTaskExtension> {
             // sync with testing-subplugin

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

@@ -1,10 +1,11 @@
+// Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import org.jetbrains.intellij.platform.gradle.Constants.Configurations.Attributes
 import software.aws.toolkits.gradle.ciOnly
 import software.aws.toolkits.gradle.findFolders
 import software.aws.toolkits.gradle.intellij.IdeVersions
 
-// Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
 plugins {
     id("java")
     id("idea")
@@ -31,10 +32,18 @@ sourceSets {
 
 configurations.getByName("integrationTestCompileClasspath") {
     extendsFrom(configurations.getByName(JavaPlugin.TEST_COMPILE_CLASSPATH_CONFIGURATION_NAME))
+    attributes {
+        attribute(Attributes.extracted, true)
+        attribute(Attributes.collected, true)
+    }
 }
 
 configurations.getByName("integrationTestRuntimeClasspath") {
     extendsFrom(configurations.getByName(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME))
+    attributes {
+        attribute(Attributes.extracted, true)
+        attribute(Attributes.collected, true)
+    }
     isCanBeResolved = true
 }
 
@@ -71,12 +80,6 @@ tasks.check {
 
 afterEvaluate {
     plugins.withType<ToolkitIntellijSubpluginPlugin> {
-        // weird implicit dependency issue, maybe with how the task graph works?
-        // or because tests are on the ide classpath for some reason?
-        tasks.named("classpathIndexCleanup") {
-            mustRunAfter(tasks.named("compileIntegrationTestKotlin"))
-        }
-
         // intellij plugin overrides with instrumented classes that we don't want or need
         integTestTask.configure {
             testClassesDirs = integrationTests.output.classesDirs