Merge main into feature/q-mega

aws · Nov 19, 2024 · 2e9d613 · 2e9d613
2 parents b2ec3e3 + 97900e1
commit 2e9d613
Show file tree

Hide file tree

Showing 41 changed files with 18 additions and 725 deletions.
diff --git a/.changes/next-release/removal-296b000f-72f0-4085-b985-052c180a0089.json b/.changes/next-release/removal-296b000f-72f0-4085-b985-052c180a0089.json
@@ -0,0 +1,4 @@
+{
+  "type" : "removal",
+  "description" : "Removed support for Gateway 2024.2"
+}
diff --git a/.changes/next-release/removal-d4e891f5-887f-495e-9642-48bdca9df4b8.json b/.changes/next-release/removal-d4e891f5-887f-495e-9642-48bdca9df4b8.json
@@ -0,0 +1,4 @@
+{
+  "type" : "removal",
+  "description" : "Removed support for 2023.3.x IDEs"
+}
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -14,7 +14,7 @@ jobs:
   generate_artifact_toolkit_standalone:
     strategy:
       matrix:
-        supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ]
+        supported_versions: [ '2024.1', '2024.2', '2024.3' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
   generate_artifact_q:
     strategy:
       matrix:
-        supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ]
+        supported_versions: [ '2024.1', '2024.2', '2024.3' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -75,7 +75,7 @@ jobs:
   generate_artifact_core:
     strategy:
       matrix:
-        supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ]
+        supported_versions: [ '2024.1', '2024.2', '2024.3' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/q-mega-prerelease.yml b/.github/workflows/q-mega-prerelease.yml
@@ -23,7 +23,7 @@ jobs:
     needs: [ time ]
     strategy:
       matrix:
-        supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ]
+        supported_versions: [ '2024.1', '2024.2', '2024.3' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -54,7 +54,7 @@ jobs:
     needs: [ time ]
     strategy:
       matrix:
-        supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ]
+        supported_versions: [ '2024.1', '2024.2', '2024.3' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.run/Run AWS Toolkit - Community [2023.3].run.xml b/.run/Run AWS Toolkit - Community [2023.3].run.xml
diff --git a/.run/Run AWS Toolkit - Gateway [2024.2].run.xml b/.run/Run AWS Toolkit - Gateway [2024.2].run.xml
diff --git a/.run/Run AWS Toolkit - Rider [2023.3].run.xml b/.run/Run AWS Toolkit - Rider [2023.3].run.xml
diff --git a/.run/Run AWS Toolkit - Ultimate [2023.3].run.xml b/.run/Run AWS Toolkit - Ultimate [2023.3].run.xml
diff --git a/.run/Run All - Community [2023.3].run.xml b/.run/Run All - Community [2023.3].run.xml
diff --git a/.run/Run All - Rider [2023.3].run.xml b/.run/Run All - Rider [2023.3].run.xml
diff --git a/.run/Run All - Ultimate [2023.3].run.xml b/.run/Run All - Ultimate [2023.3].run.xml
diff --git a/.run/Run Amazon Q - Community [2023.3].run.xml b/.run/Run Amazon Q - Community [2023.3].run.xml
diff --git a/.run/Run Amazon Q - Rider [2023.3].run.xml b/.run/Run Amazon Q - Rider [2023.3].run.xml
diff --git a/.run/Run Amazon Q - Ultimate [2023.3].run.xml b/.run/Run Amazon Q - Ultimate [2023.3].run.xml
diff --git a/.run/generateConfigs.py b/.run/generateConfigs.py
@@ -52,7 +52,7 @@ def write_config(mv: str, ide: IdeVariant, plugin: PluginVariant):
         f.write(TEMPLATE.format(plugin = plugin, variant = ide, major_version = mv))
 
 if __name__ == '__main__':
-    mvs = ["2023.3", "2024.1", "2024.2", "2024.3"]
+    mvs = ["2024.1", "2024.2", "2024.3"]
     ides = [
         IdeVariant("Community", "IC"),
         IdeVariant("Rider", "RD"),

diff --git a/...brains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QOpenPanelAction.kt b/...brains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QOpenPanelAction.kt
@@ -15,7 +15,7 @@ import software.aws.toolkits.telemetry.UiTelemetry
 
 class QOpenPanelAction : AnAction(message("action.q.openchat.text"), null, AwsIcons.Logos.AWS_Q) {
     override fun actionPerformed(e: AnActionEvent) {
-        if (isRunningOnRemoteBackend() || !isQSupportedInThisVersion()) return
+        if (isRunningOnRemoteBackend()) return
         val project = e.getRequiredData(CommonDataKeys.PROJECT)
         UiTelemetry.click(project, "q_openChat")
         ToolWindowManager.getInstance(project).getToolWindow(AMAZON_Q_WINDOW_ID)?.activate(null, true)

diff --git a/...zer/utils/CodeTransformModuleUtilsTest.kt → ...zer/utils/CodeTransformModuleUtilsTest.kt b/...zer/utils/CodeTransformModuleUtilsTest.kt → ...zer/utils/CodeTransformModuleUtilsTest.kt
diff --git a/...er/utils/CodeTransformProjectUtilsTest.kt → ...er/utils/CodeTransformProjectUtilsTest.kt b/...er/utils/CodeTransformProjectUtilsTest.kt → ...er/utils/CodeTransformProjectUtilsTest.kt
diff --git a/.../InlineCompletionRemoteRendererFactory.kt → .../InlineCompletionRemoteRendererFactory.kt b/.../InlineCompletionRemoteRendererFactory.kt → .../InlineCompletionRemoteRendererFactory.kt
diff --git a/...software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformSharedUtils.kt b/...software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformSharedUtils.kt
@@ -9,7 +9,6 @@ import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.lazyIsUnauthedBearerConnection
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
-import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion
 import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import java.time.Instant
 
@@ -28,6 +27,6 @@ fun isValidCodeTransformConnection(project: Project): Boolean {
 }
 fun isCodeTransformAvailable(project: Project): Boolean {
     if (!isIntellij()) return false
-    if (isRunningOnRemoteBackend() || !isQSupportedInThisVersion()) return false
+    if (isRunningOnRemoteBackend()) return false
     return isValidCodeTransformConnection(project)
 }
diff --git a/...unity/src-233/com/intellij/platform/diagnostic/telemetry/helpers/UseWithoutActiveScope.kt b/...unity/src-233/com/intellij/platform/diagnostic/telemetry/helpers/UseWithoutActiveScope.kt
diff --git a/...oolkits/jetbrains/PluginVersionChecker.kt → ...oolkits/jetbrains/PluginVersionChecker.kt b/...oolkits/jetbrains/PluginVersionChecker.kt → ...oolkits/jetbrains/PluginVersionChecker.kt