Delete :intellij Gradle subproject (#4412)

It is no longer a relevant configuration after the plugin split in the 3.0 release

Author: rli

CONTRIBUTING.md

@@ -34,9 +34,13 @@ reported the issue. Please try to include as much information as you can. Detail
 
 ### Instructions
 
-1. Clone the github repository and run `./gradlew :plugin-toolkit:intellij:buildPlugin` <br/> (This will produce a plugin zip under `plugins/toolkit/intellij/build/distributions`)
-2. In your JetBrains IDE (e.g. IntelliJ) navigate to the `Plugins` preferences and select "Install Plugin from Disk...", navigate to the zip file produced in step 1. 
-3. You will be prompted to restart your IDE.
+1. Clone the github repository.
+2. To manually build a plugin distribution, run the `buildPlugin` task on the relevant Gradle project. 
+   - For example, `./gradlew :plugin-toolkit:intellij-standalone:buildPlugin` will produce a plugin zip under `plugins/toolkit/intellij-standalone/build/distributions`.
+   - You can also run the `:plugin-core:buildPlugin` and `:plugin-amazonq:buildPlugin` tasks 
+   - Use the `-PideProfileName={JETBRAINS_VERSION}` option to build the plugin for a particular IDE version (e.g `./gradlew :plugin-toolkit:intellij-standalone:buildPlugin -PideProfileName=2024.1`)
+3. In your JetBrains IDE (e.g. IntelliJ) navigate to the `Plugins` preferences and select "Install Plugin from Disk...", navigate to the zip file(s) produced in step 2.
+4. You will be prompted to restart your IDE.
 
 ## Contributing via Pull Requests
 
@@ -84,13 +88,19 @@ If ran using the Debug feature, a debugger will be auto-attached to the sandbox
 
   ```
   # IntelliJ IDEA Community
-  ./gradlew :plugin-toolkit:intellij:runIde -PrunIdeVariant=IC
+  ./gradlew :plugin-toolkit:intellij-standalone:runIde -PrunIdeVariant=IC
+  ./gradlew :plugin-amazonq:runIde -PrunIdeVariant=IC
+  ./gradlew :sandbox-all:runIde -PrunIdeVariant=IC
 
   # IntelliJ IDEA Ultimate
-  ./gradlew :plugin-toolkit:intellij:runIde -PrunIdeVariant=IU
+  ./gradlew :plugin-toolkit:intellij-standalone:runIde -PrunIdeVariant=IU
+  ./gradlew :plugin-amazonq:runIde -PrunIdeVariant=IU
+  ./gradlew :sandbox-all:runIde -PrunIdeVariant=IU
 
   # Rider
-  ./gradlew :plugin-toolkit:intellij:runIde -PrunIdeVariant=RD
+  ./gradlew :plugin-toolkit:intellij-standalone:runIde -PrunIdeVariant=RD
+  ./gradlew :plugin-amazonq:runIde -PrunIdeVariant=RD
+  ./gradlew :sandbox-all:runIde -PrunIdeVariant=RD
 
   # Gateway
   ./gradlew :plugin-toolkit:jetbrains-gateway:runIde
@@ -101,7 +111,7 @@ If ran using the Debug feature, a debugger will be auto-attached to the sandbox
 
 - To run the plugin in a **specific JetBrains IDE** (and you have it installed), specify the `ALTERNATIVE_IDE` environment variable:
   ```
-  ALTERNATIVE_IDE=/path/to/ide ./gradlew :plugin-toolkit:intellij:runIde
+  ALTERNATIVE_IDE=/path/to/ide ./gradlew :plugin-toolkit:intellij-standalone:runIde
   ```
   - This is needed to run PyCharm and WebStorm.
   - See also `alternativeIdePath` option in the `runIde` tasks provided by the Gradle IntelliJ Plugin [documentation](https://github.com/JetBrains/gradle-intellij-plugin).

build.gradle.kts

@@ -47,7 +47,9 @@ tasks.createRelease.configure {
 }
 
 dependencies {
-    aggregateCoverage(project(":plugin-toolkit:intellij"))
+    aggregateCoverage(project(":plugin-toolkit:intellij-standalone"))
+    aggregateCoverage(project(":plugin-core"))
+    aggregateCoverage(project(":plugin-amazonq"))
 
     project.findProject(":plugin-toolkit:jetbrains-gateway")?.let {
         aggregateCoverage(it)
@@ -58,7 +60,7 @@ dependencies {
 
 tasks.register("runIde") {
     doFirst {
-        throw GradleException("Use project specific runIde command, i.e. :plugin-toolkit:intellij:runIde")
+        throw GradleException("Use project specific runIde command, i.e. :plugin-toolkit:intellij-standalone:runIde")
     }
 }
 

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

@@ -141,7 +141,7 @@ tasks.buildPlugin {
         throwIfSubmodule("""
         The build generated by this task is not an accurate representation of what will be published to the JetBrains Marketplace.
         Please run the task associated with the composite build instead.
-        (e.g. :plugin-toolkit:intellij:buildPlugin, :plugin-toolkit:jetbrains-gateway:buildPlugin, :plugin-amazonq:buildPlugin)
+        (e.g. :plugin-toolkit:intellij-standalone:buildPlugin, :plugin-toolkit:jetbrains-gateway:buildPlugin, :plugin-amazonq:buildPlugin)
     """.trimIndent())
     }
 }
@@ -151,7 +151,7 @@ tasks.runIde {
         throwIfSubmodule("""
         The IDE sandbox generated by this task is not an accurate representation of what will be published to the JetBrains Marketplace.
         Please run the task associated with the composite build instead.
-        (e.g. :plugin-toolkit:intellij:runIde, :plugin-toolkit:jetbrains-gateway:runIde, :plugin-amazonq:runIde)
+        (e.g. :plugin-toolkit:intellij-standalone:runIde, :plugin-toolkit:jetbrains-gateway:runIde, :plugin-amazonq:runIde)
     """.trimIndent())
     }
 

buildspec/linuxTests.yml

@@ -33,7 +33,7 @@ phases:
 
       - chmod +x gradlew
       - su codebuild-user -c "./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME check coverageReport --info --stacktrace --console plain --continue"
-      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :plugin-toolkit:intellij:buildPlugin
+      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :plugin-toolkit:intellij-standalone:buildPlugin :plugin-core:buildPlugin :plugin-amazonq:buildPlugin
       - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
       - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') # Encode `#` in the URL because otherwise the url is clipped in the Codecov.io site
       - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
@@ -50,7 +50,7 @@ phases:
       - rsync -rmq --include='*/' --include '**/build/idea-sandbox/system*/log/**' --exclude='*' . $TEST_ARTIFACTS/ || true
       - rsync -rmq --include='*/' --include '**/build/reports/**' --exclude='*' . $TEST_ARTIFACTS/ || true
       - rsync -rmq --include='*/' --include '**/test-results/**/*.xml' --exclude='*' . $TEST_ARTIFACTS/test-reports || true
-      - cp -r ./plugins/toolkit/intellij/build/distributions/*.zip $BUILD_ARTIFACTS/ || touch $BUILD_ARTIFACTS/build_failed
+      - cp -r ./plugins/**/build/distributions/*.zip $BUILD_ARTIFACTS/ || touch $BUILD_ARTIFACTS/build_failed
 
 reports:
   unit-test:
@@ -68,4 +68,4 @@ artifacts:
       files:
         - /tmp/buildArtifacts/*
       discard-paths: yes
-      name: plugin.zip
+      name: plugins.zip

buildspec/linuxUiTests.yml

@@ -45,7 +45,7 @@ phases:
         credential_source=EcsContainer"
         
       - chmod +x gradlew
-      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :plugin-toolkit:intellij:buildPlugin --console plain --info
+      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :sandbox-all:prepareUiTestingSandbox --console plain --info
 
       - ffmpeg -loglevel quiet -nostdin -f x11grab -video_size ${SCREEN_WIDTH}x${SCREEN_HEIGHT} -i ${DISPLAY} -codec:v libx264 -pix_fmt yuv420p -vf drawtext="fontsize=48:box=1:[email protected]:boxborderw=5:fontcolor=white:x=0:y=h-text_h:text='%{gmtime\:%H\\\\\:%M\\\\\:%S}'" -framerate 12 -g 12 /tmp/screen_recording.mp4 &
       - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME uiTestCore coverageReport --console plain --info

plugins/toolkit/intellij/build.gradle.kts

@@ -26,6 +26,10 @@ intellijToolkit {
     ideFlavor.set(IdeFlavor.IC)
 }
 
+intellij {
+    plugins.add(project(":plugin-core"))
+}
+
 val changelog = tasks.register<GeneratePluginChangeLog>("pluginChangeLog") {
     includeUnreleased.set(true)
     changeLogFile.set(project.file("$buildDir/changelog/change-notes.xml"))
@@ -144,10 +148,24 @@ tasks.processTestResources {
     // TODO how can we remove this. Fails due to:
     // "customerUploadedEventSchemaMultipleTypes.json.txt is a duplicate but no duplicate handling strategy has been set"
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
 
-    // delete when fully split
-    // pull in shim to make tests pass
-    from(project(":plugin-toolkit:intellij").file("src/main/resources"))
+// delete when fully split
+// pull in shim to make tests pass
+val dummyPluginJar = tasks.register<Jar>("dummyPluginJar") {
+    archiveFileName.set("dummy.jar")
+
+    from(project.file("test-plugin-shim.xml")) {
+        rename { "plugin-shim.xml" }
+        into("META-INF")
+    }
+}
+
+tasks.prepareTestingSandbox {
+    dependsOn(dummyPluginJar)
+
+    intoChild(pluginName.map { "$it/lib" })
+        .from(dummyPluginJar)
 }
 
 dependencies {
@@ -196,6 +214,5 @@ dependencies {
     testRuntimeOnly(libs.slf4j.jdk14)
 
     // delete when fully split
-    testRuntimeOnly(project(":plugin-core:jetbrains-community"))
     testRuntimeOnly(project(":plugin-amazonq", "moduleOnlyJars"))
 }

plugins/toolkit/intellij/src/main/resources/META-INF/plugin-shim.xml

@@ -0,0 +1,7 @@
+<!-- Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
+    <depends>aws.toolkit.core</depends>
+    <xi:include href="/META-INF/module-amazonq.xml" />
+</idea-plugin>

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

@@ -42,6 +42,7 @@ intellijToolkit {
 
 intellij {
     type.set("RD")
+    plugins.add(project(":plugin-core"))
 }
 
 sourceSets {