Skip to content

Commit 62ec203

Browse files
leigaolleigaol
authored
Merge branch 'main' into move
2 parents bc53524 + bf33e46 commit 62ec203

File tree

87 files changed

+749
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+749
-236
lines changed

‎.changes/next-release/bugfix-bcf4a2c9-230b-440b-93ed-8b2fb96929be.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Fix an IDE deadlock that may occur while attempting to initialize Amazon Q UI elements (#4966)"
4+
}

‎.changes/next-release/feature-dd281d60-2902-47d0-b7d6-bf0bd6225abd.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "feature",
3+
"description" : "Add support for 2024.3"
4+
}

‎.github/workflows/mac.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717

1818
steps:
1919
- uses: actions/checkout@v2
20-
- name: Set up JDK 17
20+
- name: Set up JDK 21
2121
uses: actions/setup-java@v1
2222
with:
23-
java-version: 17
23+
java-version: 21
2424
- name: Grant execute permission for gradlew
2525
run: chmod +x gradlew
2626
- name: Build with Gradle

‎.github/workflows/prerelease.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
generate_artifact_toolkit_standalone:
1515
strategy:
1616
matrix:
17-
supported_versions: [ '2023.3', '2024.1', '2024.2' ]
17+
supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ]
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
4646
generate_artifact_q:
4747
strategy:
4848
matrix:
49-
supported_versions: [ '2023.3', '2024.1', '2024.2' ]
49+
supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ]
5050
runs-on: ubuntu-latest
5151
steps:
5252
- uses: actions/checkout@v4
@@ -75,7 +75,7 @@ jobs:
7575
generate_artifact_core:
7676
strategy:
7777
matrix:
78-
supported_versions: [ '2023.3', '2024.1', '2024.2' ]
78+
supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ]
7979
runs-on: ubuntu-latest
8080
steps:
8181
- uses: actions/checkout@v4

‎.github/workflows/qodana-check.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
qodana:
1616
runs-on: ubuntu-latest
1717
permissions:
18+
contents: read
1819
# PR check
1920
checks: write
2021
# PR comments
@@ -33,7 +34,7 @@ jobs:
3334
tool-cache: false
3435
large-packages: false
3536
- name: 'Qodana Scan'
36-
uses: JetBrains/qodana-action@v2024.1.9
37+
uses: JetBrains/qodana-action@v2024.2.3
3738
env:
3839
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
3940
with:

‎.run/Run AWS Toolkit - Community [2024.3].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run AWS Toolkit - Community [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2024.3" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<RunAsTest>false</RunAsTest>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Run AWS Toolkit - Gateway [2024.2].run.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
8-
<option name="scriptParameters" value="-PideProfileName=2024.2" />
8+
<option name="scriptParameters" value=" -PideProfileName=2024.2" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:jetbrains-gateway:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

‎.run/Run AWS Toolkit - Gateway [2024.3].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run AWS Toolkit - Gateway [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value=" -PideProfileName=2024.3" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value=":plugin-toolkit:jetbrains-gateway:runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<RunAsTest>false</RunAsTest>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Run AWS Toolkit - Rider [2024.3].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run AWS Toolkit - Rider [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2024.3" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<RunAsTest>false</RunAsTest>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Run AWS Toolkit - Ultimate [2024.3].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run AWS Toolkit - Ultimate [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PrunIdeVariant=IU -PideProfileName=2024.3" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<RunAsTest>false</RunAsTest>
23+
<method v="2" />
24+
</configuration>
25+
</component>

0 commit comments

Comments
 (0)