Skip to content

Commit 4a11f71

Browse files
committed
Merge remote-tracking branch 'upstream/main' into custom
2 parents 771fe88 + 5347314 commit 4a11f71

File tree

24 files changed

+507
-52
lines changed

24 files changed

+507
-52
lines changed

.changes/3.69.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"date" : "2025-04-28",
3+
"version" : "3.69",
4+
"entries" : [ {
5+
"type" : "bugfix",
6+
"description" : "Amazon Q: Fix issue where context menu items are not available after re-opening projects or restarting the IDE"
7+
}, {
8+
"type" : "bugfix",
9+
"description" : "Fix LinkageError while attempting to do Amazon Q inline suggestions in certain environments"
10+
}, {
11+
"type" : "bugfix",
12+
"description" : "Fix issue where user can become stuck because Amazon Q Chat does not show authentication prompt"
13+
}, {
14+
"type" : "removal",
15+
"description" : "Removed support for 2024.1.x IDEs"
16+
}, {
17+
"type" : "removal",
18+
"description" : "Removed support for Gateway 2024.3"
19+
} ]
20+
}

.changes/next-release/bugfix-31222d0f-5ff2-4495-9bf2-e354eabc82c7.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

.changes/next-release/bugfix-7c7e1720-545f-4b5e-8d21-511f40fabf38.json

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "increase /review timeout"
4+
}

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

Lines changed: 0 additions & 4 deletions
This file was deleted.

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

Lines changed: 0 additions & 4 deletions
This file was deleted.

CHANGELOG.md

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

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,40 +103,40 @@ object IdeVersions {
103103
Profile(
104104
name = "2025.1",
105105
gateway = ProductProfile(
106-
sdkVersion = "251.23774-EAP-CANDIDATE-SNAPSHOT",
106+
sdkVersion = "251.23774.441-CUSTOM-SNAPSHOT",
107107
bundledPlugins = listOf("org.jetbrains.plugins.terminal")
108108
),
109109
community = ProductProfile(
110-
sdkVersion = "251.23774.109-EAP-SNAPSHOT",
110+
sdkVersion = "2025.1",
111111
bundledPlugins = commonPlugins + listOf(
112112
"com.intellij.java",
113113
"com.intellij.gradle",
114114
"org.jetbrains.idea.maven",
115115
),
116116
marketplacePlugins = listOf(
117-
"PythonCore:251.23774.109",
118-
"Docker:251.23774.109"
117+
"PythonCore:251.23774.460",
118+
"Docker:251.23774.466"
119119
)
120120
),
121121
ultimate = ProductProfile(
122-
sdkVersion = "251.23774.109-EAP-SNAPSHOT",
122+
sdkVersion = "2025.1",
123123
bundledPlugins = commonPlugins + listOf(
124124
"JavaScript",
125125
"JavaScriptDebugger",
126126
"com.intellij.database",
127127
"com.jetbrains.codeWithMe",
128128
),
129129
marketplacePlugins = listOf(
130-
"Pythonid:251.23774.109",
131-
"org.jetbrains.plugins.go:251.23774.109",
130+
"Pythonid:251.23774.460",
131+
"org.jetbrains.plugins.go:251.23774.435",
132132
)
133133
),
134134
rider = RiderProfile(
135-
sdkVersion = "2025.1-EAP8-SNAPSHOT",
135+
sdkVersion = "2025.1",
136136
bundledPlugins = commonPlugins,
137137
netFrameworkTarget = "net472",
138138
rdGenVersion = "2025.1.1",
139-
nugetVersion = " 2025.1.0-eap08"
139+
nugetVersion = " 2025.1.0"
140140
)
141141
),
142142
).associateBy { it.name }

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ configurations {
5555
// Make sure we exclude stuff we either A) ships with IDE, B) we don't use to cut down on size
5656
runtimeClasspath {
5757
exclude(group = "com.google.code.gson")
58-
exclude(group = "org.slf4j", module = "slf4j-jdk14")
5958
exclude(group = "org.jetbrains.kotlin")
6059
exclude(group = "org.jetbrains.kotlinx")
6160
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
# Toolkit Version
5-
toolkitVersion=3.69-SNAPSHOT
5+
toolkitVersion=3.70-SNAPSHOT
66

77
# Publish Settings
88
publishToken=

0 commit comments

Comments
 (0)