build: migrate Core to a shadow JAR dependency (#6112)

Author: breedloj

gradle/libs.versions.toml

@@ -31,6 +31,7 @@ node-gradle = "7.0.2"
 telemetryGenerator = "1.0.338"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
+shadow = "9.2.2"
 # test-only; platform provides slf4j transitively at runtime
 slf4j = "2.0.16"
 sshd = "2.13.2"
@@ -128,5 +129,6 @@ mockito = ["mockito-core", "mockito-junit-jupiter", "mockito-kotlin"]
 sshd = ["sshd-core", "sshd-scp", "sshd-sftp"]
 
 [plugins]
+gradleup-shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 node-gradle = { id = "com.github.node-gradle.node", version.ref = "node-gradle" }

plugins/amazonq/build.gradle.kts

@@ -34,10 +34,7 @@ tasks.jar {
 }
 
 dependencies {
-    intellijPlatform {
-        localPlugin(project(":plugin-core"))
-    }
-
+    implementation(project(path = ":plugin-core", configuration = "shadow"))
     implementation(project(":plugin-amazonq:chat"))
     implementation(project(":plugin-amazonq:codetransform"))
     implementation(project(":plugin-amazonq:codewhisperer"))

plugins/amazonq/chat/jetbrains-community/build.gradle.kts

@@ -12,9 +12,7 @@ intellijToolkit {
 }
 
 dependencies {
-    intellijPlatform {
-        localPlugin(project(":plugin-core"))
-    }
+    implementation(project(path = ":plugin-core", configuration = "shadow"))
 
     implementation(project(":plugin-amazonq:shared:jetbrains-community"))
     // everything references codewhisperer, which is not ideal
@@ -26,3 +24,13 @@ dependencies {
 
     testImplementation(testFixtures(project(":plugin-core:jetbrains-community")))
 }
+
+// hack because our test structure currently doesn't make complete sense
+tasks.prepareTestSandbox {
+    val pluginXmlJar = project(":plugin-amazonq").tasks.jar
+
+    dependsOn(pluginXmlJar)
+    from(pluginXmlJar) {
+        into(intellijPlatform.projectName.map { "$it/lib" })
+    }
+}

plugins/amazonq/codetransform/jetbrains-community/build.gradle.kts

@@ -12,9 +12,7 @@ intellijToolkit {
 }
 
 dependencies {
-    intellijPlatform {
-        localPlugin(project(":plugin-core"))
-    }
+    implementation(project(path = ":plugin-core", configuration = "shadow"))
 
     implementation(project(":plugin-amazonq:shared:jetbrains-community"))
     // hack because transform has a chat entrypoint

plugins/amazonq/codewhisperer/jetbrains-community/build.gradle.kts

@@ -12,9 +12,7 @@ intellijToolkit {
 }
 
 dependencies {
-    intellijPlatform {
-        localPlugin(project(":plugin-core"))
-    }
+    implementation(project(path = ":plugin-core", configuration = "shadow"))
 
     compileOnly(project(":plugin-core:jetbrains-community"))
 

plugins/amazonq/codewhisperer/jetbrains-ultimate/build.gradle.kts

@@ -12,9 +12,7 @@ intellijToolkit {
 }
 
 dependencies {
-    intellijPlatform {
-        localPlugin(project(":plugin-core"))
-    }
+    implementation(project(path = ":plugin-core", configuration = "shadow"))
 
     compileOnly(project(":plugin-amazonq:codewhisperer:jetbrains-community"))
     compileOnly(project(":plugin-amazonq:shared:jetbrains-ultimate"))

plugins/amazonq/shared/jetbrains-community/build.gradle.kts

@@ -14,10 +14,11 @@ intellijToolkit {
 
 dependencies {
     intellijPlatform {
-        localPlugin(project(":plugin-core"))
         platformDependency(Coordinates(groupId = "com.jetbrains.intellij.rd", artifactId = "rd-platform"))
     }
 
+    implementation(project(path = ":plugin-core", configuration = "shadow"))
+
     compileOnlyApi(project(":plugin-core:jetbrains-community"))
 
     // CodeWhispererTelemetryService uses a CircularFifoQueue

plugins/amazonq/src/main/resources/META-INF/plugin.xml

@@ -2,6 +2,9 @@
 <!-- SPDX-License-Identifier: Apache-2.0 -->
 
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" require-restart="true">
+    <xi:include href="/META-INF/module-core.xml" />
+    <xi:include href="/META-INF/aws.toolkit.core.xml" />
+
     <id>amazon.q</id>
     <name>Amazon Q</name>
     <description><![CDATA[
@@ -60,7 +63,8 @@
     <depends optional="true">org.jetbrains.idea.maven</depends>
     <resource-bundle>software.aws.toolkits.resources.MessagesBundle</resource-bundle>
 
-    <depends>aws.toolkit.core</depends>
+    <incompatible-with>aws.toolkit.core</incompatible-with>
+
     <depends>com.intellij.modules.lang</depends>
 
     <depends optional="true" config-file="amazonq-ext-codewithme.xml">com.jetbrains.codeWithMe</depends>
@@ -104,4 +108,15 @@
     <xi:include href="/META-INF/change-notes.xml" xpointer="xpointer(/idea-plugin/*)">
         <xi:fallback/>
     </xi:include>
+
+    <extensions defaultExtensionNs="com.intellij">
+        <!-- each plugin needs its own instance of these -->
+        <applicationService serviceImplementation="migration.software.aws.toolkits.jetbrains.core.coroutines.PluginCoroutineScopeTracker"/>
+        <projectService serviceImplementation="migration.software.aws.toolkits.jetbrains.core.coroutines.PluginCoroutineScopeTracker"/>
+        <postStartupActivity implementation = "software.aws.toolkits.jetbrains.core.notifications.NotificationServiceInitializer"/>
+        <postStartupActivity implementation="software.aws.toolkits.jetbrains.services.telemetry.AwsToolkitStartupMetrics"/>
+    </extensions>
+    <projectListeners>
+        <listener class="software.aws.toolkits.jetbrains.services.telemetry.OpenedFileTypesMetricsListener" topic="com.intellij.openapi.fileEditor.FileEditorManagerListener"/>
+    </projectListeners>
 </idea-plugin>

plugins/core/src/test/kotlin/software/aws/toolkits/jetbrains/core/PluginCoreJvmBinaryCompatabilityTest.kt renamed to plugins/amazonq/src/test/kotlin/software/aws/toolkits/jetbrains/core/PluginCoreJvmBinaryCompatabilityTest.kt

@@ -2,10 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 plugins {
-    id("toolkit-publishing-conventions")
-    id("toolkit-publish-root-conventions")
     id("toolkit-jvm-conventions")
     id("toolkit-testing")
+    alias(libs.plugins.gradleup.shadow)
 }
 
 dependencies {
@@ -19,9 +18,34 @@ dependencies {
     implementation(libs.slf4j.jdk14)
 }
 
+configurations {
+    configureEach {
+        // IDE provides netty
+        exclude("io.netty")
+    }
+
+    // Make sure we exclude stuff we either A) ships with IDE, B) we don't use to cut down on size
+    runtimeClasspath {
+        exclude(group = "com.google.code.gson")
+        exclude(group = "org.jetbrains.kotlin")
+        exclude(group = "org.jetbrains.kotlinx")
+    }
+}
+
 tasks.check {
     val coreProject = project(":plugin-core").subprojects
     coreProject.forEach {
         dependsOn(":plugin-core:${it.name}:check")
     }
 }
+
+tasks.shadowJar {
+    archiveBaseName.set("plugin-core-shadow")
+    archiveVersion.set(rootProject.version.toString())
+    archiveClassifier.set("")
+
+    exclude("/META-INF/plugin.xml")
+
+    configurations = project.configurations.runtimeClasspath.map { listOf(it) }
+    destinationDirectory.set(layout.buildDirectory.dir("libs"))
+}