Skip to content

Commit eb26509

Browse files
authored
Merge branch 'main' into capability-card
2 parents f4ec817 + a39df44 commit eb26509

File tree

6 files changed

+24
-8
lines changed

6 files changed

+24
-8
lines changed

.changes/3.56.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"date" : "2025-02-20",
3+
"version" : "3.56",
4+
"entries" : [ {
5+
"type" : "feature",
6+
"description" : "Amazon Q /doc: support making changes to architecture diagrams"
7+
} ]
8+
}

.changes/next-release/feature-bfb6687a-a302-4968-8e7e-8fa0d4ef6c53.json

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

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# _3.56_ (2025-02-20)
2+
- **(Feature)** Amazon Q /doc: support making changes to architecture diagrams
3+
14
# _3.55_ (2025-02-13)
25
- **(Feature)** /transform: support transformations to Java 21
36
- **(Bug Fix)** Enable syntax highlighting when viewing diff for /test

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
# Toolkit Version
5-
toolkitVersion=3.56-SNAPSHOT
5+
toolkitVersion=3.57-SNAPSHOT
66

77
# Publish Settings
88
publishToken=
99
publishChannel=
1010

11-
ideProfileName=2024.2
11+
ideProfileName=2024.3
1212

1313
remoteRobotPort=8080
1414

ui-tests-starter/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ tasks.test {
5858
useJUnitPlatform()
5959

6060
systemProperty("ui.test.plugins", testPlugins.get().asPath)
61+
systemProperty("org.gradle.project.ideProfileName", ideProfile.name)
6162
}
6263

6364
// hack to disable ui tests in ./gradlew check

ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt renamed to ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1+
// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33
package software.aws.toolkits.jetbrains.uitests
44

55
import com.intellij.driver.sdk.openFile
66
import com.intellij.driver.sdk.ui.ui
77
import com.intellij.driver.sdk.waitForProjectOpen
88
import com.intellij.ide.starter.ci.CIServer
9+
import com.intellij.ide.starter.config.ConfigurationStorage
910
import com.intellij.ide.starter.di.di
1011
import com.intellij.ide.starter.driver.engine.runIdeWithDriver
1112
import com.intellij.ide.starter.ide.IdeProductProvider
@@ -28,6 +29,13 @@ class OfflineAmazonQInlineCompletionTest {
2829
di = DI {
2930
extend(di)
3031
bindSingleton<CIServer>(overrides = true) { TestCIServer }
32+
val defaults = ConfigurationStorage.instance().defaults.toMutableMap().apply {
33+
put("LOG_ENVIRONMENT_VARIABLES", (!System.getenv("CI").toBoolean()).toString())
34+
}
35+
36+
bindSingleton<ConfigurationStorage>(overrides = true) {
37+
ConfigurationStorage(this, defaults)
38+
}
3139
}
3240
}
3341

@@ -38,7 +46,7 @@ class OfflineAmazonQInlineCompletionTest {
3846
LocalProjectInfo(
3947
Paths.get("tstData", "Hello")
4048
)
41-
).useRelease("2024.2")
49+
).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
4250
Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json")
4351
.createParentDirectories()
4452
.writeText(

0 commit comments

Comments
 (0)