merge conflicts resolved

Author: manodnyab

.changes/3.69.json

@@ -0,0 +1,20 @@
+{
+  "date" : "2025-04-28",
+  "version" : "3.69",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix issue where context menu items are not available after re-opening projects or restarting the IDE"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix LinkageError while attempting to do Amazon Q inline suggestions in certain environments"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix issue where user can become stuck because Amazon Q Chat does not show authentication prompt"
+  }, {
+    "type" : "removal",
+    "description" : "Removed support for 2024.1.x IDEs"
+  }, {
+    "type" : "removal",
+    "description" : "Removed support for Gateway 2024.3"
+  } ]
+}

.changes/next-release/removal-5979b9e4-898d-405a-9fc4-5919bb972a0e.json

@@ -1,3 +1,10 @@
+# _3.69_ (2025-04-28)
+- **(Bug Fix)** Amazon Q: Fix issue where context menu items are not available after re-opening projects or restarting the IDE
+- **(Bug Fix)** Fix LinkageError while attempting to do Amazon Q inline suggestions in certain environments
+- **(Bug Fix)** Fix issue where user can become stuck because Amazon Q Chat does not show authentication prompt
+- **(Removal)** Removed support for 2024.1.x IDEs
+- **(Removal)** Removed support for Gateway 2024.3
+
 # _3.68_ (2025-04-23)
 - **(Feature)** Amazon Q: Show visual indicator in status bar if profile selection is needed to continue with Q Inline / Q Chat
 - **(Feature)** Amazon Q /test: Remove unsupported message for non-java python languages

.changes/next-release/removal-6b54ddb0-1385-4788-a225-ddae6ac958d2.json

@@ -39,7 +39,7 @@ enum class ChangeType(val sectionTitle: String) {
 
     class Serializer : StdSerializer<ChangeType>(ChangeType::class.java) {
         override fun serialize(value: ChangeType, gen: JsonGenerator?, provider: SerializerProvider?) {
-            gen?.writeString(value.name.toLowerCase())
+            gen?.writeString(value.name.lowercase())
         }
     }
 }

CHANGELOG.md

@@ -65,7 +65,7 @@ open class NewChange : ChangeLogTask() {
         )
     }
 
-    private fun newFile(changeType: ChangeType) = nextReleaseDirectory.file("${changeType.name.toLowerCase()}-${UUID.randomUUID()}.json").get().asFile.apply {
+    private fun newFile(changeType: ChangeType) = nextReleaseDirectory.file("${changeType.name.lowercase()}-${UUID.randomUUID()}.json").get().asFile.apply {
         parentFile?.mkdirs()
         createNewFile()
     }

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/changelog/ChangeLog.kt

@@ -48,9 +48,11 @@ configurations {
 
         // Exclude dependencies that ship with iDE
         exclude(group = "org.slf4j")
-        // we want kotlinx-coroutines-debug and kotlinx-coroutines-test
-        exclude(group = "org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm")
-        exclude(group = "org.jetbrains.kotlinx", "kotlinx-coroutines-core")
+        if (!name.startsWith("kotlinCompiler") && !name.startsWith("generateModels") && !name.startsWith("rdGen")) {
+            // we want kotlinx-coroutines-debug and kotlinx-coroutines-test
+            exclude(group = "org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm")
+            exclude(group = "org.jetbrains.kotlinx", "kotlinx-coroutines-core")
+        }
 
         resolutionStrategy.eachDependency {
             if (requested.group == "org.jetbrains.kotlinx" && requested.name.startsWith("kotlinx-coroutines")) {

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/changelog/tasks/NewChange.kt

@@ -54,7 +54,7 @@ configurations {
 
     // Make sure we exclude stuff we either A) ships with IDE, B) we don't use to cut down on size
     runtimeClasspath {
-        exclude(group = "org.slf4j")
+        exclude(group = "com.google.code.gson")
         exclude(group = "org.jetbrains.kotlin")
         exclude(group = "org.jetbrains.kotlinx")
     }

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

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.69-SNAPSHOT
+toolkitVersion=3.70-SNAPSHOT
 
 # Publish Settings
 publishToken=

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

@@ -19,9 +19,10 @@ junit4 = "4.13.2"
 junit5 = "5.11.0"
 # https://plugins.jetbrains.com/docs/intellij/kotlin.html#adding-kotlin-support
 # https://kotlinlang.org/docs/releases.html#release-details
-kotlin = "2.0.0"
+kotlin = "2.1.20"
 # set in <root>/settings.gradle.kts
 kotlinCoroutines = "1.8.0"
+lsp4j = "0.24.0"
 mockito = "5.12.0"
 mockitoKotlin = "5.4.0"
 mockk = "1.13.17"
@@ -105,6 +106,7 @@ kotlin-coroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-tes
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 kotlin-stdLibJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
+lsp4j = { module = "org.eclipse.lsp4j:org.eclipse.lsp4j", version.ref = "lsp4j" }
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
 mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlin" }