build: fix JVM crash when switching between IDE MV builds (aws#5955)

rli · web-flow · commit 62096365d4ae · 2025-08-13T13:09:51.000-07:00
In 252, the coroutine debug agent has a new JAR entrypoint.
Due to a platform plugin bug, Gradle will always cache the agent jar,
which results in a class not found crash when launching the IDE.
diff --git a/buildSrc/src/main/kotlin/temp-toolkit-intellij-root-conventions.gradle.kts b/buildSrc/src/main/kotlin/temp-toolkit-intellij-root-conventions.gradle.kts
@@ -53,11 +53,13 @@ intellijPlatform {
 tasks.prepareSandbox {
     val pluginName = intellijPlatform.projectName
 
-    intoChild(pluginName.map { "$it/dotnet" })
-        .from(resharperDlls)
+    from(resharperDlls) {
+        into(pluginName.map { "$it/dotnet" })
+    }
 
-    intoChild(pluginName.map { "$it/gateway-resources" })
-        .from(gatewayResources)
+    from(gatewayResources) {
+        into(pluginName.map { "$it/gateway-resources" })
+    }
 }
 
 // We have no source in this project, so skip test task
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ detekt = "1.23.8"
 diff-util = "4.12"
 intellijExt = "1.1.8"
 # match with <root>/settings.gradle.kts
-intellijGradle = "2.6.0"
+intellijGradle = "2.7.1"
 intellijRemoteRobot = "0.11.22"
 jackson = "2.17.2"
 jacoco = "0.8.12"
diff --git a/plugins/amazonq/build.gradle.kts b/plugins/amazonq/build.gradle.kts
@@ -133,8 +133,10 @@ val prepareBundledFlare by tasks.registering(Copy::class) {
 }
 
 tasks.withType<PrepareSandboxTask>().configureEach {
-    intoChild(intellijPlatform.projectName.map { "$it/lib" })
-        .from(file("contrib/QCT-Maven-6-16.jar"))
-    intoChild(intellijPlatform.projectName.map { "$it/flare" })
-        .from(prepareBundledFlare)
+    from(file("contrib/QCT-Maven-6-16.jar")) {
+        into(intellijPlatform.projectName.map { "$it/lib" })
+    }
+    from(prepareBundledFlare) {
+        into(intellijPlatform.projectName.map { "$it/flare" })
+    }
 }
diff --git a/plugins/amazonq/codetransform/jetbrains-community/build.gradle.kts b/plugins/amazonq/codetransform/jetbrains-community/build.gradle.kts
@@ -32,6 +32,7 @@ tasks.prepareTestSandbox {
     val pluginXmlJar = project(":plugin-amazonq").tasks.jar
 
     dependsOn(pluginXmlJar)
-    intoChild(intellijPlatform.projectName.map { "$it/lib" })
-        .from(pluginXmlJar)
+    from(pluginXmlJar) {
+        into(intellijPlatform.projectName.map { "$it/lib" })
+    }
 }
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/build.gradle.kts b/plugins/amazonq/codewhisperer/jetbrains-community/build.gradle.kts
@@ -31,6 +31,7 @@ tasks.prepareTestSandbox {
     val pluginXmlJar = project(":plugin-amazonq").tasks.jar
 
     dependsOn(pluginXmlJar)
-    intoChild(intellijPlatform.projectName.map { "$it/lib" })
-        .from(pluginXmlJar)
+    from(pluginXmlJar) {
+        into(intellijPlatform.projectName.map { "$it/lib" })
+    }
 }
diff --git a/plugins/amazonq/codewhisperer/jetbrains-ultimate/build.gradle.kts b/plugins/amazonq/codewhisperer/jetbrains-ultimate/build.gradle.kts
@@ -31,6 +31,7 @@ tasks.prepareTestSandbox {
     val pluginXmlJar = project(":plugin-amazonq").tasks.jar
 
     dependsOn(pluginXmlJar)
-    intoChild(intellijPlatform.projectName.map { "$it/lib" })
-        .from(pluginXmlJar)
+    from(pluginXmlJar) {
+        into(intellijPlatform.projectName.map { "$it/lib" })
+    }
 }
diff --git a/plugins/amazonq/shared/jetbrains-community/build.gradle.kts b/plugins/amazonq/shared/jetbrains-community/build.gradle.kts
@@ -30,6 +30,7 @@ tasks.prepareTestSandbox {
     val pluginXmlJar = project(":plugin-amazonq").tasks.jar
 
     dependsOn(pluginXmlJar)
-    intoChild(intellijPlatform.projectName.map { "$it/lib" })
-        .from(pluginXmlJar)
+    from(pluginXmlJar) {
+        into(intellijPlatform.projectName.map { "$it/lib" })
+    }
 }
diff --git a/plugins/core/jetbrains-community/build.gradle.kts b/plugins/core/jetbrains-community/build.gradle.kts
@@ -95,6 +95,7 @@ tasks.prepareTestSandbox {
     val pluginXmlJar = project(":plugin-core").tasks.jar
 
     dependsOn(pluginXmlJar)
-    intoChild(intellijPlatform.projectName.map { "$it/lib" })
-        .from(pluginXmlJar)
+    from(pluginXmlJar) {
+        into(intellijPlatform.projectName.map { "$it/lib" })
+    }
 }
diff --git a/plugins/toolkit/jetbrains-gateway/build.gradle.kts b/plugins/toolkit/jetbrains-gateway/build.gradle.kts
@@ -138,8 +138,9 @@ tasks.jar {
 }
 
 tasks.withType<PrepareSandboxTask>().configureEach {
-    intoChild(intellijPlatform.projectName.map { "$it/gateway-resources" })
-        .from(gatewayResourcesDir)
+    from(gatewayResourcesDir) {
+        into(intellijPlatform.projectName.map { "$it/gateway-resources" })
+    }
 }
 
 listOf(
@@ -150,8 +151,9 @@ listOf(
         runtimeClasspath.setFrom(gatewayOnlyRuntimeClasspath)
 
         dependsOn(gatewayOnlyResourcesJar)
-        intoChild(intellijPlatform.projectName.map { "$it/lib" })
-            .from(gatewayOnlyResourcesJar)
+        from(gatewayOnlyResourcesJar) {
+            into(intellijPlatform.projectName.map { "$it/lib" })
+        }
     }
 }
 
diff --git a/plugins/toolkit/jetbrains-rider/build.gradle.kts b/plugins/toolkit/jetbrains-rider/build.gradle.kts
@@ -338,8 +338,9 @@ tasks.withType<PrepareSandboxTask>().configureEach {
 
     dependsOn(resharperDllsDir)
 
-    intoChild(intellijPlatform.projectName.map { "$it/dotnet" })
-        .from(resharperDllsDir)
+    from(resharperDllsDir) {
+        into(intellijPlatform.projectName.map { "$it/dotnet" })
+    }
 }
 
 tasks.compileKotlin {
diff --git a/sandbox-all/build.gradle.kts b/sandbox-all/build.gradle.kts
@@ -6,6 +6,7 @@ import software.aws.toolkits.gradle.intellij.IdeFlavor
 import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
 
 plugins {
+    id("toolkit-jvm-conventions")
     id("toolkit-intellij-plugin")
     id("toolkit-publish-root-conventions")
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -17,20 +17,32 @@ val codeArtifactMavenRepo = fun RepositoryHandler.(): MavenArtifactRepository? {
     } else {
         null
     }
-}.also {
-    pluginManagement {
-        repositories {
-            it()
-            maven("https://oss.sonatype.org/content/repositories/snapshots/")
-            gradlePluginPortal()
+}
+
+pluginManagement {
+    repositories {
+        // unfortunately pluginManagement is special, so we need to duplicate
+        val codeArtifactUrl: Provider<String> = providers.environmentVariable("CODEARTIFACT_URL")
+        val codeArtifactToken: Provider<String> = providers.environmentVariable("CODEARTIFACT_AUTH_TOKEN")
+        if (codeArtifactUrl.isPresent && codeArtifactToken.isPresent) {
+            maven {
+                url = uri(codeArtifactUrl.get())
+                credentials {
+                    username = "aws"
+                    password = codeArtifactToken.get()
+                }
+            }
         }
+
+        gradlePluginPortal()
+        maven("https://central.sonatype.com/repository/maven-snapshots/")
     }
 }
 
 plugins {
     id("com.github.burrunan.s3-build-cache") version "1.5"
     id("com.gradle.develocity") version "3.17.6"
-    id("org.jetbrains.intellij.platform.settings") version "2.6.0"
+    id("org.jetbrains.intellij.platform.settings") version "2.7.1"
 }
 
 dependencyResolutionManagement {

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,10 @@ val prepareBundledFlare by tasks.registering(Copy::class) {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`tasks.withType<PrepareSandboxTask>().configureEach {`
`136`		`- intoChild(intellijPlatform.projectName.map { "$it/lib" })`
`137`		`- .from(file("contrib/QCT-Maven-6-16.jar"))`
`138`		`- intoChild(intellijPlatform.projectName.map { "$it/flare" })`
`139`		`- .from(prepareBundledFlare)`
	`136`	`+ from(file("contrib/QCT-Maven-6-16.jar")) {`
	`137`	`+ into(intellijPlatform.projectName.map { "$it/lib" })`
	`138`	`+ }`
	`139`	`+ from(prepareBundledFlare) {`
	`140`	`+ into(intellijPlatform.projectName.map { "$it/flare" })`
	`141`	`+ }`
`140`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ tasks.prepareTestSandbox {`
`32`	`32`	`val pluginXmlJar = project(":plugin-amazonq").tasks.jar`
`33`	`33`
`34`	`34`	`dependsOn(pluginXmlJar)`
`35`		`- intoChild(intellijPlatform.projectName.map { "$it/lib" })`
`36`		`- .from(pluginXmlJar)`
	`35`	`+ from(pluginXmlJar) {`
	`36`	`+ into(intellijPlatform.projectName.map { "$it/lib" })`
	`37`	`+ }`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ tasks.prepareTestSandbox {`
`31`	`31`	`val pluginXmlJar = project(":plugin-amazonq").tasks.jar`
`32`	`32`
`33`	`33`	`dependsOn(pluginXmlJar)`
`34`		`- intoChild(intellijPlatform.projectName.map { "$it/lib" })`
`35`		`- .from(pluginXmlJar)`
	`34`	`+ from(pluginXmlJar) {`
	`35`	`+ into(intellijPlatform.projectName.map { "$it/lib" })`
	`36`	`+ }`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ tasks.prepareTestSandbox {`
`30`	`30`	`val pluginXmlJar = project(":plugin-amazonq").tasks.jar`
`31`	`31`
`32`	`32`	`dependsOn(pluginXmlJar)`
`33`		`- intoChild(intellijPlatform.projectName.map { "$it/lib" })`
`34`		`- .from(pluginXmlJar)`
	`33`	`+ from(pluginXmlJar) {`
	`34`	`+ into(intellijPlatform.projectName.map { "$it/lib" })`
	`35`	`+ }`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ tasks.prepareTestSandbox {`
`95`	`95`	`val pluginXmlJar = project(":plugin-core").tasks.jar`
`96`	`96`
`97`	`97`	`dependsOn(pluginXmlJar)`
`98`		`- intoChild(intellijPlatform.projectName.map { "$it/lib" })`
`99`		`- .from(pluginXmlJar)`
	`98`	`+ from(pluginXmlJar) {`
	`99`	`+ into(intellijPlatform.projectName.map { "$it/lib" })`
	`100`	`+ }`
`100`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,9 @@ tasks.jar {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`tasks.withType<PrepareSandboxTask>().configureEach {`
`141`		`- intoChild(intellijPlatform.projectName.map { "$it/gateway-resources" })`
`142`		`- .from(gatewayResourcesDir)`
	`141`	`+ from(gatewayResourcesDir) {`
	`142`	`+ into(intellijPlatform.projectName.map { "$it/gateway-resources" })`
	`143`	`+ }`
`143`	`144`	`}`
`144`	`145`
`145`	`146`	`listOf(`
`@@ -150,8 +151,9 @@ listOf(`
`150`	`151`	`runtimeClasspath.setFrom(gatewayOnlyRuntimeClasspath)`
`151`	`152`
`152`	`153`	`dependsOn(gatewayOnlyResourcesJar)`
`153`		`- intoChild(intellijPlatform.projectName.map { "$it/lib" })`
`154`		`- .from(gatewayOnlyResourcesJar)`
	`154`	`+ from(gatewayOnlyResourcesJar) {`
	`155`	`+ into(intellijPlatform.projectName.map { "$it/lib" })`
	`156`	`+ }`
`155`	`157`	`}`
`156`	`158`	`}`
`157`	`159`
Original file line number	Diff line number	Diff line change
`@@ -338,8 +338,9 @@ tasks.withType<PrepareSandboxTask>().configureEach {`
`338`	`338`
`339`	`339`	`dependsOn(resharperDllsDir)`
`340`	`340`
`341`		`- intoChild(intellijPlatform.projectName.map { "$it/dotnet" })`
`342`		`- .from(resharperDllsDir)`
	`341`	`+ from(resharperDllsDir) {`
	`342`	`+ into(intellijPlatform.projectName.map { "$it/dotnet" })`
	`343`	`+ }`
`343`	`344`	`}`
`344`	`345`
`345`	`346`	`tasks.compileKotlin {`