Skip to content

Commit 3f577c5

Browse files
authored
Merge pull request #394 from ProjectMapK/develop
Release 2025-09-27 02:53:40 +0000
2 parents af165b9 + 6ceae86 commit 3f577c5

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/test-main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ jobs:
4040
fail-fast: false
4141
matrix:
4242
# LTS versions, latest version (if exists)
43-
java-version: [ '17', '21', '24' ]
43+
java-version: [ '17', '21', '25' ]
4444
# Minimum version, latest release version, latest pre-release version (if exists)
45-
kotlin: ['2.0.21', '2.1.21', '2.2.20']
45+
kotlin: ['2.1.21', '2.2.20']
4646
env:
4747
KOTLIN_VERSION: ${{ matrix.kotlin }}
4848
name: "Kotlin ${{ matrix.kotlin }} - Java ${{ matrix.java-version }}"

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ val jacksonVersion = libs.versions.jackson.get()
1818
val generatedSrcPath = "${layout.buildDirectory.get()}/generated/kotlin"
1919

2020
group = groupStr
21-
version = "${jacksonVersion}-beta30"
21+
version = "${jacksonVersion}-beta31"
2222

2323
repositories {
2424
mavenCentral()

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
kotlin = "2.0.21" # Mainly for CI, it can be rewritten by environment variable.
2+
kotlin = "2.1.21" # Mainly for CI, it can be rewritten by environment variable.
33
jackson = "2.20.0"
44

55
# test libs
@@ -22,4 +22,4 @@ jackson-csv = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-cs
2222
jackson-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" }
2323

2424
[plugins]
25-
kotlinter = { id = "org.jmailen.kotlinter", version = "5.0.2" }
25+
kotlinter = { id = "org.jmailen.kotlinter", version = "5.1.1" }

0 commit comments

Comments
 (0)