Skip to content

Commit baadae5

Browse files
committed
Upgrade Gradle and JVM to latest versions
Updated Gradle to version 8.13 and JVM toolchain to version 21 across the project and workflows. Adjusted dependencies and configurations to ensure compatibility, and streamlined build scripts with minor fixes for better functionality.
1 parent ac2230d commit baadae5

9 files changed

Lines changed: 20 additions & 20 deletions

File tree

.github/workflows/build.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,12 @@ jobs:
4040
- name: Fetch Sources
4141
uses: actions/checkout@v4
4242

43-
# Validate wrapper
44-
- name: Gradle Wrapper Validation
45-
uses: gradle/actions/wrapper-validation@v4
46-
4743
# Set up Java environment for the next steps
4844
- name: Setup Java
4945
uses: actions/setup-java@v4
5046
with:
5147
distribution: zulu
52-
java-version: 17
48+
java-version: 21
5349

5450
# Setup Gradle
5551
- name: Setup Gradle
@@ -109,7 +105,7 @@ jobs:
109105
uses: actions/setup-java@v4
110106
with:
111107
distribution: zulu
112-
java-version: 17
108+
java-version: 21
113109

114110
# Setup Gradle
115111
- name: Setup Gradle
@@ -154,17 +150,20 @@ jobs:
154150
# Check out the current repository
155151
- name: Fetch Sources
156152
uses: actions/checkout@v4
153+
with:
154+
ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
155+
fetch-depth: 0 # a full history is required for pull request analysis
157156

158157
# Set up Java environment for the next steps
159158
- name: Setup Java
160159
uses: actions/setup-java@v4
161160
with:
162161
distribution: zulu
163-
java-version: 17
162+
java-version: 21
164163

165164
# Run Qodana inspections
166165
- name: Qodana - Code Inspection
167-
uses: JetBrains/qodana-action@v2024.3.4
166+
uses: JetBrains/qodana-action@v2024.3
168167
env:
169168
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} # read the steps about it below
170169
with:
@@ -194,7 +193,7 @@ jobs:
194193
uses: actions/setup-java@v4
195194
with:
196195
distribution: zulu
197-
java-version: 17
196+
java-version: 21
198197

199198
# Setup Gradle
200199
- name: Setup Gradle

.github/workflows/release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ jobs:
2929
uses: actions/setup-java@v4
3030
with:
3131
distribution: zulu
32-
java-version: 17
32+
java-version: 21
3333

3434
# Setup Gradle
3535
- name: Setup Gradle
3636
uses: gradle/actions/setup-gradle@v4
3737

38-
3938
# Set environment variables
4039
- name: Export Properties
4140
id: properties

.github/workflows/run-ui-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: actions/setup-java@v4
4141
with:
4242
distribution: zulu
43-
java-version: 17
43+
java-version: 21
4444

4545
# Setup Gradle
4646
- name: Setup Gradle

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ version = providers.gradleProperty("pluginVersion").get()
1616

1717
// Set the JVM language level used to build the project.
1818
kotlin {
19-
jvmToolchain(17)
19+
jvmToolchain(21)
2020
}
2121

2222
// Configure project's dependencies

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ platformPlugins = com.dmarcotte.handlebars:251.23774.318
2020
# Example: platformBundledPlugins = com.intellij.java
2121
platformBundledPlugins = com.jetbrains.php, JavaScript, org.jetbrains.plugins.less, org.jetbrains.plugins.sass
2222
# Gradle Releases -> https://github.com/gradle/gradle/releases
23-
gradleVersion = 8.10.2
23+
gradleVersion = 8.13
24+
2425
# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
2526
kotlin.stdlib.default.dependency = false
2627

gradle/libs.versions.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[versions]
22
# libraries
33
junit = "4.13.2"
4+
opentest4j = "1.3.0"
45

56
# plugins
67
changelog = "2.2.1"
@@ -11,10 +12,11 @@ qodana = "2024.3.4"
1112

1213
[libraries]
1314
junit = { group = "junit", name = "junit", version.ref = "junit" }
15+
opentest4j = { group = "org.opentest4j", name = "opentest4j", version.ref = "opentest4j" }
1416

1517
[plugins]
1618
changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
1719
intelliJPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "intelliJPlatform" }
1820
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
1921
kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
20-
qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" }
22+
qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" }

gradle/wrapper/gradle-wrapper.jar

122 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7-
zipStorePath=wrapper/dists
7+
zipStorePath=wrapper/dists

gradlew

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

0 commit comments

Comments
 (0)