Fix Gateway plugin zip not including version information (#4698)

Author: rli

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

@@ -2,44 +2,21 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
-import org.jetbrains.intellij.platform.gradle.tasks.BuildPluginTask
 import org.jetbrains.intellij.platform.gradle.tasks.PatchPluginXmlTask
-import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask
-import software.aws.toolkits.gradle.buildMetadata
 import software.aws.toolkits.gradle.intellij.IdeFlavor
-import software.aws.toolkits.gradle.intellij.IdeVersions
 import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
-import software.aws.toolkits.gradle.isCi
 
 // publish-root should imply publishing-conventions, but we keep separate so that gateway always has the GW flavor
 plugins {
     id("toolkit-intellij-plugin")
     id("org.jetbrains.intellij.platform")
 }
 
-val ideProfile = IdeVersions.ideProfile(project)
-val toolkitVersion: String by project
-
-// please check changelog generation logic if this format is changed
-version = "$toolkitVersion-${ideProfile.shortName}"
-
 tasks.withType<PatchPluginXmlTask>().configureEach {
     sinceBuild.set(toolkitIntelliJ.ideProfile().map { it.sinceVersion })
     untilBuild.set(toolkitIntelliJ.ideProfile().map { it.untilVersion })
 }
 
-// attach the current commit hash on local builds
-if (!project.isCi()) {
-    val buildMetadata = buildMetadata()
-    tasks.withType<PatchPluginXmlTask>().configureEach {
-        pluginVersion.set("${project.version}+$buildMetadata")
-    }
-
-    tasks.named<BuildPluginTask>("buildPlugin") {
-        archiveClassifier.set(buildMetadata)
-    }
-}
-
 intellijPlatform {
     instrumentCode = false
 

buildSrc/src/main/kotlin/toolkit-publishing-conventions.gradle.kts

@@ -1,13 +1,35 @@
 // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
+import org.jetbrains.intellij.platform.gradle.tasks.BuildPluginTask
+import org.jetbrains.intellij.platform.gradle.tasks.PatchPluginXmlTask
 import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask
+import software.aws.toolkits.gradle.buildMetadata
 import software.aws.toolkits.gradle.intellij.IdeVersions
+import software.aws.toolkits.gradle.isCi
 
 plugins {
     id("org.jetbrains.intellij.platform")
 }
 
+val ideProfile = IdeVersions.ideProfile(project)
+val toolkitVersion: String by project
+
+// please check changelog generation logic if this format is changed
+version = "$toolkitVersion-${ideProfile.shortName}"
+
+// attach the current commit hash on local builds
+if (!project.isCi()) {
+    val buildMetadata = buildMetadata()
+    tasks.withType<PatchPluginXmlTask>().configureEach {
+        pluginVersion.set("${project.version}+$buildMetadata")
+    }
+
+    tasks.named<BuildPluginTask>("buildPlugin") {
+        archiveClassifier.set(buildMetadata)
+    }
+}
+
 intellijPlatform {
     publishing {
         val publishToken: String by project

buildspec/linuxTests.yml

@@ -52,7 +52,7 @@ phases:
       - rsync -rmq --include='*/' --include '**/build/idea-sandbox/**/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/**/build/distributions/*.zip $BUILD_ARTIFACTS/ || touch $BUILD_ARTIFACTS/build_failed
+      - find plugins -path '*/build/distributions/*.zip' -exec cp {} $BUILD_ARTIFACTS/ \; || touch $BUILD_ARTIFACTS/build_failed
 
 reports:
   unit-test:

buildspec/linuxTestsForAmazonQ.yml

@@ -50,7 +50,7 @@ phases:
       - rsync -rmq --include='*/' --include '**/build/idea-sandbox/**/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/core/build/distributions/*.zip $BUILD_ARTIFACTS/ || touch $BUILD_ARTIFACTS/build_failed
+      - cp -r ./plugins/amazonq/build/distributions/*.zip $BUILD_ARTIFACTS/ || touch $BUILD_ARTIFACTS/build_failed
 
 reports:
   unit-test:

plugins/amazonq/build.gradle.kts

@@ -37,22 +37,6 @@ dependencies {
     implementation(project(":plugin-amazonq:shared"))
 }
 
-val moduleOnlyJar = tasks.create<Jar>("moduleOnlyJar") {
-    archiveClassifier.set("module-only")
-    // empty jar
-}
-
-val moduleOnlyJars by configurations.creating {
-    isCanBeConsumed = true
-    isCanBeResolved = false
-    // If you want this configuration to share the same dependencies, otherwise omit this line
-    extendsFrom(configurations["implementation"], configurations["runtimeOnly"])
-}
-
-artifacts {
-    add("moduleOnlyJars", moduleOnlyJar)
-}
-
 tasks.check {
     val serviceSubdirs = project(":plugin-amazonq").subprojects
     serviceSubdirs.forEach { serviceSubDir ->