Skip to content

Commit 7f82602

Browse files
committed
Merge remote-tracking branch 'origin/main' into rli/remote-chat-wip
2 parents 47706df + 279b9b0 commit 7f82602

File tree

36 files changed

+181
-171
lines changed

36 files changed

+181
-171
lines changed

.changes/3.24.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"date" : "2024-08-22",
3+
"version" : "3.24",
4+
"entries" : [ {
5+
"type" : "feature",
6+
"description" : "Add notification for IdC users on extended session"
7+
}, {
8+
"type" : "bugfix",
9+
"description" : "Amazon Q: update login logo styling"
10+
}, {
11+
"type" : "bugfix",
12+
"description" : "Amazon Q Code Transformation: show an error notification when download diff fails"
13+
}, {
14+
"type" : "bugfix",
15+
"description" : "Fix UI freeze that occurs when viewing an Amazon Q code security scanning finding"
16+
}, {
17+
"type" : "bugfix",
18+
"description" : "Fix Q building supplemental context under EDT which might slow or block the UI"
19+
} ]
20+
}
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 bug where text with inline code copied from Amazon Q Chat had new line breaks around the inline code text"
4+
}
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 bug when disabled commands does not get filtered in quick actions"
4+
}

.changes/next-release/bugfix-94d0f043-0356-47d7-b795-71cd4016c5fd.json

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

.changes/next-release/bugfix-a9de376d-3ae7-4c30-96bd-4a8529534d87.json

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

.changes/next-release/bugfix-b645d4bd-5f65-49cc-bae1-ab866bd6eb3a.json

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

.changes/next-release/bugfix-eb2b9d18-dfc2-46fd-b772-df33d48d81d3.json

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

.changes/next-release/feature-8586b790-db73-4d9f-ab9f-606e2f607c17.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.24_ (2024-08-22)
2+
- **(Feature)** Add notification for IdC users on extended session
3+
- **(Bug Fix)** Amazon Q: update login logo styling
4+
- **(Bug Fix)** Amazon Q Code Transformation: show an error notification when download diff fails
5+
- **(Bug Fix)** Fix UI freeze that occurs when viewing an Amazon Q code security scanning finding
6+
- **(Bug Fix)** Fix Q building supplemental context under EDT which might slow or block the UI
7+
18
# _3.23_ (2024-08-15)
29
- **(Bug Fix)** Fix NPE in Rider AWS SAM project wizard ([#4768](https://github.com/aws/aws-toolkit-jetbrains/issues/4768))
310
- **(Bug Fix)** Amazon Q Chat: Fix Tab selection scrollbar visibility which causes tabs half visible if there are several tabs open

buildSrc/src/main/kotlin/toolkit-detekt.gradle.kts

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33
import io.gitlab.arturbosch.detekt.Detekt
44
import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
5-
import kotlin.reflect.KVisibility
6-
import kotlin.reflect.full.companionObject
7-
import kotlin.reflect.full.companionObjectInstance
8-
import kotlin.reflect.full.functions
9-
import kotlin.reflect.full.memberFunctions
10-
import kotlin.reflect.full.memberProperties
5+
import software.aws.toolkits.gradle.jvmTarget
116

127
plugins {
138
id("io.gitlab.arturbosch.detekt")
@@ -21,9 +16,9 @@ dependencies {
2116
detektPlugins(project(":detekt-rules"))
2217
}
2318

24-
private val detektFiles = fileTree(projectDir).asFileTree.matching {
19+
private val detektFiles = fileTree(projectDir).matching {
2520
include("**/*.kt", "**/*.kts")
26-
exclude("**/build/**")
21+
exclude("**/build")
2722
}
2823

2924
detekt {
@@ -36,14 +31,22 @@ detekt {
3631
autoCorrect = true
3732
}
3833

34+
val javaVersion = project.jvmTarget().get()
35+
3936
tasks.withType<Detekt>().configureEach {
37+
jvmTarget = javaVersion.majorVersion
38+
dependsOn(":detekt-rules:assemble")
39+
4040
reports {
4141
html.required.set(true) // Human readable report
4242
xml.required.set(true) // Checkstyle like format for CI tool integrations
4343
}
4444
}
4545

4646
tasks.withType<DetektCreateBaselineTask>().configureEach {
47+
jvmTarget = javaVersion.majorVersion
48+
dependsOn(":detekt-rules:assemble")
49+
4750
// weird issue where the baseline tasks can't find the source code
4851
source.plus(detektFiles)
4952
}

0 commit comments

Comments
 (0)