Merge branch 'main' into samgst/AddClientRegistrationErrorMetrics

Author: samgst-amazon

.changes/3.34.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2024-10-22",
+  "version" : "3.34",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Fix issue where the plugin can't read SSO tokens from disk / always returns 'Unable to load client registration'"
+  } ]
+}

.changes/next-release/bugfix-b18a6b61-e1e9-42dd-952d-7c32ea7a3a19.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix pointless busy loop in Amazon Q wasting CPU cycles (#5000)"
+}

.changes/next-release/bugfix-e0e23b25-959c-46ef-a9f9-13283cff5568.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Update `@workspace` index when adding or deleting a file"
+}

.changes/next-release/deprecation-a09c7f8f-fb8c-4f71-8039-f86faf4c7273.json

@@ -0,0 +1,4 @@
+{
+  "type" : "deprecation",
+  "description" : "An upcoming release will remove support for JetBrains Gateway version 2024.2 and for IDEs based on the 2023.3 platform"
+}

.changes/next-release/feature-c5c4cc47-126a-4236-82af-70743a805ca8.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q /dev: Add stop generation action"
+}

.changes/next-release/feature-d2858ed1-62fc-461b-93b3-6edf82df2855.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Added inline chat support. Select some code and hit ⌘+I on Mac or Ctrl+I on Windows to start"
+}

CHANGELOG.md

@@ -1,3 +1,6 @@
+# _3.34_ (2024-10-22)
+- **(Bug Fix)** Fix issue where the plugin can't read SSO tokens from disk / always returns 'Unable to load client registration'
+
 # _3.33_ (2024-10-17)
 - **(Feature)** Add support for 2024.3
 - **(Bug Fix)** `@workspace` cannot properly locate certain folders for certain project setup

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -101,7 +101,7 @@ object IdeVersions {
         Profile(
             name = "2024.2",
             gateway = ProductProfile(
-                sdkVersion = "242.20224-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "242.23726-EAP-CANDIDATE-SNAPSHOT",
                 bundledPlugins = listOf("org.jetbrains.plugins.terminal")
             ),
             community = ProductProfile(
@@ -132,11 +132,11 @@ object IdeVersions {
                 )
             ),
             rider = RiderProfile(
-                sdkVersion = "2024.2-EAP7-SNAPSHOT",
+                sdkVersion = "2024.2",
                 bundledPlugins = commonPlugins,
                 netFrameworkTarget = "net472",
                 rdGenVersion = "2024.1.1",
-                nugetVersion = " 2024.2.0-eap07"
+                nugetVersion = " 2024.2.0"
             )
         ),
         Profile(

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

@@ -35,10 +35,6 @@ configurations {
         // IDE provides Kotlin
         exclude(group = "org.jetbrains.kotlin")
         exclude(group = "org.jetbrains.kotlinx")
-
-        exclude(group = "com.fasterxml.jackson.core")
-        exclude(group = "com.fasterxml.jackson.module", "jackson-module-kotlin")
-        exclude(group = "com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml")
     }
 
     configureEach {

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

@@ -20,7 +20,7 @@ tasks.withType<PatchPluginXmlTask>().configureEach {
 intellijPlatform {
     instrumentCode = false
 
-    verifyPlugin {
+    pluginVerification {
         ides {
             // recommended() appears to resolve latest EAP for a product?
             ide(provider { IntelliJPlatformType.IntellijIdeaCommunity }, toolkitIntelliJ.version())
@@ -65,14 +65,6 @@ dependencies {
     }
 }
 
-configurations {
-    runtimeClasspath {
-        exclude(group = "com.fasterxml.jackson.core")
-        exclude(group = "com.fasterxml.jackson.module", "jackson-module-kotlin")
-        exclude(group = "com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml")
-    }
-}
-
 tasks.runIde {
     systemProperty("aws.toolkit.developerMode", true)
     systemProperty("ide.plugins.snapshot.on.unload.fail", true)