Skip to content

Commit b668269

Browse files
committed
chore: update JVM toolchain configuration to version 25 and simplify publish.yml
1 parent c08472d commit b668269

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.github/workflows/publish.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ env:
1212
SLNE_RELEASES_REPO_USERNAME: ${{ secrets.SLNE_RELEASES_REPO_USERNAME }}
1313
SLNE_RELEASES_REPO_PASSWORD: ${{ secrets.SLNE_RELEASES_REPO_PASSWORD }}
1414
MODULE_REGEX: "surf-database.*-all\\.jar$"
15-
JVM_TARGET: "25"
1615

1716
jobs:
1817
build:
@@ -40,16 +39,16 @@ jobs:
4039
uses: actions/setup-java@v4
4140
with:
4241
distribution: 'graalvm'
43-
java-version: ${{ env.JVM_TARGET }}
42+
java-version: '25'
4443

4544
- name: Build all modules with Gradle
46-
run: ./gradlew build shadowJar --parallel --no-scan -jvm-target ${{ env.JVM_TARGET }}
45+
run: ./gradlew build shadowJar --parallel --no-scan
4746

4847
- name: Check all modules with Gradle
49-
run: ./gradlew check --parallel --no-scan -jvm-target ${{ env.JVM_TARGET }}
48+
run: ./gradlew check --parallel --no-scan
5049

5150
- name: Publish all modules to Maven
52-
run: ./gradlew publish --parallel --no-scan -jvm-target ${{ env.JVM_TARGET }}
51+
run: ./gradlew publish --parallel --no-scan
5352

5453
- name: Extract Project Version
5554
id: get_version

build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ dependencies {
2121
runtimeOnly(libs.mariadb)
2222
}
2323

24+
kotlin {
25+
jvmToolchain(25)
26+
}
27+
2428
publishing {
2529
repositories {
2630
slneReleases()

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ pluginManagement {
1212
}
1313

1414
plugins {
15-
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
15+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
1616
}

0 commit comments

Comments
 (0)