Skip to content

Commit c42d69c

Browse files
committed
Merge remote-tracking branch 'FasterXML/2.18' into 2.19
2 parents 02216d4 + 593afc4 commit c42d69c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/dep_build_v2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# Versions need to align with ones in 'main.yml' workflow
1919
# kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10.
2020
# https://youtrack.jetbrains.com/issue/KT-65156
21-
kotlin_version: ['1.8.10', '1.9.24', '2.0.21', '2.1.0-RC2']
21+
kotlin_version: ['1.8.10', '1.9.24', '2.0.21', '2.1.0']
2222
env:
2323
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2424
steps:

.github/workflows/dep_build_v3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# Versions need to align with ones in 'main.yml' workflow
1919
# kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10.
2020
# https://youtrack.jetbrains.com/issue/KT-65156
21-
kotlin_version: ['1.8.10', '1.9.24', '2.0.21', '2.1.0-RC2']
21+
kotlin_version: ['1.8.10', '1.9.24', '2.0.21', '2.1.0']
2222
env:
2323
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2424
steps:

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
java_version: ['8', '11', '17', '21', '23']
3131
# kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10.
3232
# https://youtrack.jetbrains.com/issue/KT-65156
33-
kotlin_version: ['1.8.10', '1.9.24', '2.0.21', '2.1.0-RC2']
33+
kotlin_version: ['1.8.10', '1.9.24', '2.0.21', '2.1.0']
3434
include:
3535
- java_version: '8'
3636
kotlin_version: '1.8.10'

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ and those with secondary constructors or static factories are also supported.
1010

1111
# Status
1212

13-
* release `2.18.0` (for Jackson `2.18.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.18)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.18)
14-
* release `2.17.2` (for Jackson `2.17.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.17)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.17)
13+
* release `2.18.2` (for Jackson `2.18.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.18)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.18)
14+
* release `2.17.3` (for Jackson `2.17.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.17)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.17)
1515
* release `2.16.2` (for Jackson `2.16.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.16)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.16)
1616
* release `2.15.4` (for Jackson `2.15.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.15)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.15)
1717
* release `2.14.3` (for Jackson `2.14.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.14)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.14)
@@ -28,7 +28,7 @@ Maven:
2828
<dependency>
2929
<groupId>com.fasterxml.jackson.module</groupId>
3030
<artifactId>jackson-module-kotlin</artifactId>
31-
<version>2.18.0</version>
31+
<version>2.18.2</version>
3232
</dependency>
3333
```
3434

@@ -111,7 +111,7 @@ println(arrayNode.toString()) // ["foo",true,1,1.0,"YmFy"]
111111
Different `kotlin-core` versions are supported by different Jackson Kotlin module minor versions.
112112
Here is an incomplete list of supported versions:
113113

114-
* Jackson 2.18.x: Kotlin-core 1.8 - 2.0
114+
* Jackson 2.18.x: Kotlin-core 1.8 - 2.1
115115
* Jackson 2.17.x: Kotlin-core 1.7 - 2.0
116116
* Jackson 2.16.x: Kotlin-core 1.6 - 1.9
117117
* Jackson 2.15.x: Kotlin-core 1.5 - 1.8

0 commit comments

Comments
 (0)