Skip to content

Commit e55726b

Browse files
authored
Merge pull request #403 from ProjectMapK/develop
Release 2025-12-06 13:58:43 +0000
2 parents 3f577c5 + 0f22f92 commit e55726b

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

.github/workflows/lint-and-test-dev.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ jobs:
4141
timeout-minutes: 15
4242
steps:
4343
- name: Checkout
44-
uses: actions/checkout@v5
44+
uses: actions/checkout@v6
4545
- name: Set up java
4646
uses: actions/setup-java@v5
4747
with:
4848
java-version: '17'
4949
distribution: 'corretto'
5050
- name: Setup Gradle
51-
uses: gradle/actions/setup-gradle@v4
51+
uses: gradle/actions/setup-gradle@v5
5252
with:
5353
dependency-graph: generate-and-submit
5454
dependency-graph-continue-on-failure: false
@@ -57,7 +57,7 @@ jobs:
5757
- name: Test
5858
run: ./gradlew test
5959
- name: Publish Test Report
60-
uses: mikepenz/action-junit-report@v5
60+
uses: mikepenz/action-junit-report@v6
6161
if: always()
6262
with:
6363
report_paths: '**/build/test-results/test/TEST-*.xml'

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: git-pr-release
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414
with:
1515
fetch-depth: 0
1616
- name: git-pr-release

.github/workflows/test-main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,26 @@ jobs:
4242
# LTS versions, latest version (if exists)
4343
java-version: [ '17', '21', '25' ]
4444
# Minimum version, latest release version, latest pre-release version (if exists)
45-
kotlin: ['2.1.21', '2.2.20']
45+
kotlin: ['2.1.21', '2.2.21', '2.3.0-RC2']
4646
env:
4747
KOTLIN_VERSION: ${{ matrix.kotlin }}
4848
name: "Kotlin ${{ matrix.kotlin }} - Java ${{ matrix.java-version }}"
4949
runs-on: ubuntu-latest
5050
timeout-minutes: 15
5151
steps:
5252
- name: Checkout
53-
uses: actions/checkout@v5
53+
uses: actions/checkout@v6
5454
- name: 'Set up java ${{ matrix.java-version }}'
5555
uses: actions/setup-java@v5
5656
with:
5757
java-version: '${{ matrix.java-version }}'
5858
distribution: 'corretto'
5959
- name: Setup Gradle
60-
uses: gradle/actions/setup-gradle@v4
60+
uses: gradle/actions/setup-gradle@v5
6161
- name: Test
6262
run: ./gradlew test
6363
- name: Publish Test Report
64-
uses: mikepenz/action-junit-report@v5
64+
uses: mikepenz/action-junit-report@v6
6565
if: always()
6666
with:
6767
report_paths: '**/build/test-results/test/TEST-*.xml'

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}-beta31"
21+
version = "${jacksonVersion}-beta32"
2222

2323
repositories {
2424
mavenCentral()

gradle/libs.versions.toml

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

55
# test libs
6-
junit = "5.13.4"
6+
junit = "5.14.1"
77

88
[libraries]
99
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib" }
@@ -16,7 +16,7 @@ jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations
1616
# test libs
1717
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect" }
1818
junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
19-
mockk = "io.mockk:mockk:1.14.5"
19+
mockk = "io.mockk:mockk:1.14.6"
2020
jackson-xml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-xml" }
2121
jackson-csv = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-csv" }
2222
jackson-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" }

0 commit comments

Comments
 (0)