Remove hack around platform plugin not handling local plugins correctly (#4677)

rli · web-flow · commit 821eadd1425d · 2024-07-17T17:36:54.000-07:00
diff --git a/buildSrc/src/main/kotlin/toolkit-publish-root-conventions.gradle.kts b/buildSrc/src/main/kotlin/toolkit-publish-root-conventions.gradle.kts
@@ -88,16 +88,6 @@ dependencies {
     }
 }
 
-// hack around: https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1620
-val pluginZip by configurations.creating {
-    isCanBeConsumed = true
-    isCanBeResolved = false
-}
-
-artifacts {
-    add("pluginZip", tasks.buildPlugin)
-}
-
 tasks.runIde {
     systemProperty("aws.toolkit.developerMode", true)
     systemProperty("ide.plugins.snapshot.on.unload.fail", true)
diff --git a/plugins/amazonq/build.gradle.kts b/plugins/amazonq/build.gradle.kts
@@ -27,7 +27,7 @@ tasks.jar {
 
 dependencies {
     intellijPlatform {
-        localPlugin(project(":plugin-core", "pluginZip"))
+        localPlugin(project(":plugin-core"))
     }
 
     implementation(project(":plugin-amazonq:chat"))
diff --git a/plugins/amazonq/chat/jetbrains-community/build.gradle.kts b/plugins/amazonq/chat/jetbrains-community/build.gradle.kts
@@ -13,7 +13,7 @@ intellijToolkit {
 
 dependencies {
     intellijPlatform {
-        localPlugin(project(":plugin-core", "pluginZip"))
+        localPlugin(project(":plugin-core"))
     }
 
     implementation(project(":plugin-amazonq:shared:jetbrains-community"))
diff --git a/plugins/amazonq/codetransform/jetbrains-community/build.gradle.kts b/plugins/amazonq/codetransform/jetbrains-community/build.gradle.kts
@@ -13,7 +13,7 @@ intellijToolkit {
 
 dependencies {
     intellijPlatform {
-        localPlugin(project(":plugin-core", "pluginZip"))
+        localPlugin(project(":plugin-core"))
     }
 
     implementation(project(":plugin-amazonq:shared:jetbrains-community"))
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/build.gradle.kts b/plugins/amazonq/codewhisperer/jetbrains-community/build.gradle.kts
@@ -13,7 +13,7 @@ intellijToolkit {
 
 dependencies {
     intellijPlatform {
-        localPlugin(project(":plugin-core", "pluginZip"))
+        localPlugin(project(":plugin-core"))
     }
 
     compileOnly(project(":plugin-core:jetbrains-community"))
diff --git a/plugins/amazonq/codewhisperer/jetbrains-ultimate/build.gradle.kts b/plugins/amazonq/codewhisperer/jetbrains-ultimate/build.gradle.kts
@@ -13,7 +13,7 @@ intellijToolkit {
 
 dependencies {
     intellijPlatform {
-        localPlugin(project(":plugin-core", "pluginZip"))
+        localPlugin(project(":plugin-core"))
     }
 
     compileOnly(project(":plugin-amazonq:codewhisperer:jetbrains-community"))
diff --git a/plugins/amazonq/shared/jetbrains-community/build.gradle.kts b/plugins/amazonq/shared/jetbrains-community/build.gradle.kts
@@ -13,7 +13,7 @@ intellijToolkit {
 
 dependencies {
     intellijPlatform {
-        localPlugin(project(":plugin-core", "pluginZip"))
+        localPlugin(project(":plugin-core"))
     }
 
     compileOnlyApi(project(":plugin-core:jetbrains-community"))
diff --git a/plugins/core/build.gradle.kts b/plugins/core/build.gradle.kts
@@ -1,9 +1,6 @@
 // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import software.aws.toolkits.gradle.intellij.IdeFlavor
-import software.aws.toolkits.gradle.intellij.IdeVersions
-
 plugins {
     id("toolkit-publishing-conventions")
     id("toolkit-publish-root-conventions")
diff --git a/plugins/core/core/tst/software/aws/toolkits/jetbrains/utils/AttributeBagTest.kt b/plugins/core/core/tst/software/aws/toolkits/jetbrains/utils/AttributeBagTest.kt
diff --git a/plugins/core/core/tst/software/aws/toolkits/jetbrains/utils/StringUtilsTest.kt b/plugins/core/core/tst/software/aws/toolkits/jetbrains/utils/StringUtilsTest.kt
diff --git a/plugins/core/jetbrains-community/build.gradle.kts b/plugins/core/jetbrains-community/build.gradle.kts
@@ -65,13 +65,13 @@ dependencies {
     api(libs.aws.iam)
 
     testFixturesApi(project(path = ":plugin-core:core", configuration = "testArtifacts"))
+    testFixturesApi(project(":plugin-core:resources"))
     testFixturesApi(libs.wiremock) {
         // conflicts with transitive inclusion from docker plugin
         exclude(group = "org.apache.httpcomponents.client5")
     }
 
     testImplementation(project(":plugin-core:core"))
-    testRuntimeOnly(project(":plugin-core:resources"))
     testRuntimeOnly(project(":plugin-core:sdk-codegen"))
 }
 
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/utils/TextUtilsTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/utils/TextUtilsTest.kt
@@ -1,4 +1,4 @@
-// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package software.aws.toolkits.jetbrains.utils
diff --git a/plugins/toolkit/intellij-standalone/build.gradle.kts b/plugins/toolkit/intellij-standalone/build.gradle.kts
@@ -22,7 +22,7 @@ intellijPlatform {
 
 dependencies {
     intellijPlatform {
-        localPlugin(project(":plugin-core", "pluginZip"))
+        localPlugin(project(":plugin-core"))
     }
 }
 
diff --git a/plugins/toolkit/jetbrains-core/build.gradle.kts b/plugins/toolkit/jetbrains-core/build.gradle.kts
@@ -33,7 +33,7 @@ intellijToolkit {
 
 dependencies {
     intellijPlatform {
-        localPlugin(project(":plugin-core", "pluginZip"))
+        localPlugin(project(":plugin-core"))
     }
 }
 
diff --git a/plugins/toolkit/jetbrains-rider/build.gradle.kts b/plugins/toolkit/jetbrains-rider/build.gradle.kts
@@ -50,7 +50,7 @@ sourceSets {
 
 dependencies {
     intellijPlatform {
-        localPlugin(project(":plugin-core", "pluginZip"))
+        localPlugin(project(":plugin-core"))
         testFramework(TestFrameworkType.Bundled)
     }
 
diff --git a/plugins/toolkit/jetbrains-ultimate/build.gradle.kts b/plugins/toolkit/jetbrains-ultimate/build.gradle.kts
@@ -17,7 +17,7 @@ intellijToolkit {
 
 dependencies {
     intellijPlatform {
-        localPlugin(project(":plugin-core", "pluginZip"))
+        localPlugin(project(":plugin-core"))
     }
     compileOnlyApi(project(":plugin-toolkit:jetbrains-core"))
     compileOnlyApi(project(":plugin-core:jetbrains-ultimate"))
diff --git a/sandbox-all/build.gradle.kts b/sandbox-all/build.gradle.kts
@@ -37,8 +37,8 @@ dependencies {
         create(type, version, useInstaller = false)
         jetbrainsRuntime()
 
-        localPlugin(project(":plugin-core", "pluginZip"))
-        localPlugin(project(":plugin-amazonq", "pluginZip"))
-        localPlugin(project(":plugin-toolkit:intellij-standalone", "pluginZip"))
+        localPlugin(project(":plugin-core"))
+        localPlugin(project(":plugin-amazonq"))
+        localPlugin(project(":plugin-toolkit:intellij-standalone"))
     }
 }
diff --git a/tmp-all/build.gradle.kts b/tmp-all/build.gradle.kts
@@ -24,13 +24,16 @@ dependencies {
         create(type, version, useInstaller = false)
         jetbrainsRuntime()
 
-        localPlugin(project(":plugin-core", "pluginZip"))
-        localPlugin(project(":plugin-amazonq", "pluginZip"))
+        localPlugin(project(":plugin-core"))
+        localPlugin(project(":plugin-amazonq"))
         plugin(toolkitIntelliJ.ideProfile().map { "aws.toolkit:2.19-${it.shortName}" })
 
         testFramework(TestFrameworkType.Bundled)
         testFramework(TestFrameworkType.JUnit5)
     }
+
+    // not sure why not plugin not resolving transitive deps
+    testRuntimeOnly(project(":plugin-core"))
 }
 
 intellijPlatform {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ tasks.jar {`
`27`	`27`
`28`	`28`	`dependencies {`
`29`	`29`	`intellijPlatform {`
`30`		`- localPlugin(project(":plugin-core", "pluginZip"))`
	`30`	`+ localPlugin(project(":plugin-core"))`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`implementation(project(":plugin-amazonq:chat"))`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ intellijToolkit {`
`13`	`13`
`14`	`14`	`dependencies {`
`15`	`15`	`intellijPlatform {`
`16`		`- localPlugin(project(":plugin-core", "pluginZip"))`
	`16`	`+ localPlugin(project(":plugin-core"))`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`implementation(project(":plugin-amazonq:shared:jetbrains-community"))`
Original file line number	Diff line number	Diff line change
`@@ -65,13 +65,13 @@ dependencies {`
`65`	`65`	`api(libs.aws.iam)`
`66`	`66`
`67`	`67`	`testFixturesApi(project(path = ":plugin-core:core", configuration = "testArtifacts"))`
	`68`	`+ testFixturesApi(project(":plugin-core:resources"))`
`68`	`69`	`testFixturesApi(libs.wiremock) {`
`69`	`70`	`// conflicts with transitive inclusion from docker plugin`
`70`	`71`	`exclude(group = "org.apache.httpcomponents.client5")`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`testImplementation(project(":plugin-core:core"))`
`74`		`- testRuntimeOnly(project(":plugin-core:resources"))`
`75`	`75`	`testRuntimeOnly(project(":plugin-core:sdk-codegen"))`
`76`	`76`	`}`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.`
	`1`	`+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`	`4`	`package software.aws.toolkits.jetbrains.utils`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ intellijPlatform {`
`22`	`22`
`23`	`23`	`dependencies {`
`24`	`24`	`intellijPlatform {`
`25`		`- localPlugin(project(":plugin-core", "pluginZip"))`
	`25`	`+ localPlugin(project(":plugin-core"))`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ intellijToolkit {`
`33`	`33`
`34`	`34`	`dependencies {`
`35`	`35`	`intellijPlatform {`
`36`		`- localPlugin(project(":plugin-core", "pluginZip"))`
	`36`	`+ localPlugin(project(":plugin-core"))`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ sourceSets {`
`50`	`50`
`51`	`51`	`dependencies {`
`52`	`52`	`intellijPlatform {`
`53`		`- localPlugin(project(":plugin-core", "pluginZip"))`
	`53`	`+ localPlugin(project(":plugin-core"))`
`54`	`54`	`testFramework(TestFrameworkType.Bundled)`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ intellijToolkit {`
`17`	`17`
`18`	`18`	`dependencies {`
`19`	`19`	`intellijPlatform {`
`20`		`- localPlugin(project(":plugin-core", "pluginZip"))`
	`20`	`+ localPlugin(project(":plugin-core"))`
`21`	`21`	`}`
`22`	`22`	`compileOnlyApi(project(":plugin-toolkit:jetbrains-core"))`
`23`	`23`	`compileOnlyApi(project(":plugin-core:jetbrains-ultimate"))`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ dependencies {`
`37`	`37`	`create(type, version, useInstaller = false)`
`38`	`38`	`jetbrainsRuntime()`
`39`	`39`
`40`		`- localPlugin(project(":plugin-core", "pluginZip"))`
`41`		`- localPlugin(project(":plugin-amazonq", "pluginZip"))`
`42`		`- localPlugin(project(":plugin-toolkit:intellij-standalone", "pluginZip"))`
	`40`	`+ localPlugin(project(":plugin-core"))`
	`41`	`+ localPlugin(project(":plugin-amazonq"))`
	`42`	`+ localPlugin(project(":plugin-toolkit:intellij-standalone"))`
`43`	`43`	`}`
`44`	`44`	`}`