Skip to content

Commit 3d0f309

Browse files
authored
Merge branch 'main' into chore/change_deprecated_icon_method
2 parents 265727c + 83e822a commit 3d0f309

File tree

7 files changed

+126
-131
lines changed

7 files changed

+126
-131
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,24 @@ jobs:
2828
sudo rm -rf /usr/local/.ghcup
2929
3030
- name: Fetch Sources
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@v6
3232

3333
- name: Setup Java
34-
uses: actions/setup-java@v3
34+
uses: actions/setup-java@v5
3535
with:
3636
distribution: zulu
3737
java-version: 17
3838

3939
- name: Setup Gradle
40-
uses: gradle/actions/setup-gradle@v4
40+
uses: gradle/actions/setup-gradle@v5
4141
with:
4242
validate-wrappers: true
4343

4444
- name: Export Properties
4545
id: properties
4646
shell: bash
4747
run: |
48-
PROPERTIES="$(./gradlew properties --console=plain -q)"
49-
VERSION="$(echo "$PROPERTIES" | grep "^version:" | cut -f2- -d ' ')"
48+
VERSION="$(grep "^pluginVersion[ ]*=" gradle.properties | cut -f2- -d '=' | tr -d ' ')"
5049
CHANGELOG="$(./gradlew getChangelog --unreleased --no-header --console=plain -q)"
5150
5251
echo "version=$VERSION" >> $GITHUB_OUTPUT
@@ -69,12 +68,14 @@ jobs:
6968
FILENAME=`ls *.zip`
7069
unzip "$FILENAME" -d content
7170
71+
FILENAME=${FILENAME:0:-4} | sed 's/[(?)]//g'
72+
7273
echo "filename=${FILENAME:0:-4}" >> $GITHUB_OUTPUT
7374
7475
- name: Upload artifact
75-
uses: actions/upload-artifact@v4
76+
uses: actions/upload-artifact@v6
7677
with:
77-
name: ${{ steps.artifact.outputs.filename }}
78+
name: 'SARIF-viewer-provider'
7879
path: ./build/distributions/content/*/*
7980

8081
verify:
@@ -108,21 +109,21 @@ jobs:
108109
sudo apt-get clean || echo "::warning::The command [sudo apt-get clean] failed to complete successfully. Proceeding..."
109110
110111
- name: Fetch Sources
111-
uses: actions/checkout@v4
112+
uses: actions/checkout@v6
112113

113114
- name: Setup Java
114-
uses: actions/setup-java@v3
115+
uses: actions/setup-java@v5
115116
with:
116117
distribution: zulu
117118
java-version: 17
118119

119120
- name: Setup Gradle
120-
uses: gradle/actions/setup-gradle@v4
121+
uses: gradle/actions/setup-gradle@v5
121122
with:
122123
validate-wrappers: true
123124

124125
- name: Setup Plugin Verifier IDEs Cache
125-
uses: actions/cache@v3
126+
uses: actions/cache@v5
126127
with:
127128
path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides
128129
key: plugin-verifier-${{ hashFiles('build/printProductsReleases.txt') }}
@@ -132,7 +133,7 @@ jobs:
132133

133134
- name: Collect Plugin Verifier Result
134135
if: ${{ always() }}
135-
uses: actions/upload-artifact@v4
136+
uses: actions/upload-artifact@v6
136137
with:
137138
name: pluginVerifier-result
138139
path: ${{ github.workspace }}/build/reports/pluginVerifier

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ repositories {
2525
dependencies {
2626
implementation("com.contrastsecurity:java-sarif:2.0")
2727
constraints {
28-
implementation("com.fasterxml.jackson.core:jackson-databind:2.20.1")
28+
implementation("com.fasterxml.jackson.core:jackson-databind:2.21.0")
2929
}
30-
testImplementation("org.assertj:assertj-core:3.27.6")
30+
testImplementation("org.assertj:assertj-core:3.27.7")
3131

3232
intellijPlatform {
3333
intellijIdeaCommunity(properties("platformVersion").get())

gradle/libs.versions.toml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
[versions]
22
# libraries
33
annotations = "24.1.0"
4-
jackson = "2.17.2"
4+
jackson = "2.21.0"
55
flexmark = "0.64.8"
66

77
# plugins
8-
dokka = "1.9.20"
9-
kotlin = "2.2.0"
10-
changelog = "2.2.1"
11-
gradleIntelliJPluginVersion = "2.10.4"
12-
kover = "0.7.3"
13-
sentry = "4.11.0"
8+
kotlin = "2.2.20"
9+
changelog = "2.5.0"
10+
gradleIntelliJPluginVersion = "2.11.0"
1411

1512
[libraries]
1613
annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
@@ -19,8 +16,5 @@ flexmark = { group = "com.vladsch.flexmark", name = "flexmark-all", version.ref
1916

2017
[plugins]
2118
changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
22-
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
2319
gradleIntelliJPlugin = { id = "org.jetbrains.intellij.platform", version.ref = "gradleIntelliJPluginVersion" }
2420
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
25-
kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
26-
sentry = { id = "io.sentry.jvm.gradle", version.ref = "sentry" }

gradle/wrapper/gradle-wrapper.jar

-17.1 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 13 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)