Skip to content

Commit 70b497c

Browse files
committed
Merge remote-tracking branch 'FasterXML/2.19'
2 parents fd624d1 + 4480101 commit 70b497c

File tree

7 files changed

+11
-16
lines changed

7 files changed

+11
-16
lines changed

.github/workflows/dep_build_v2.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ jobs:
1616
matrix:
1717
java_version: ['8', '17', '21', '23']
1818
# Versions need to align with ones in 'main.yml' workflow
19-
# kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10.
20-
# https://youtrack.jetbrains.com/issue/KT-65156
21-
kotlin_version: ['1.8.10', '1.9.24', '2.0.21', '2.1.0-RC2']
19+
kotlin_version: ['1.9.24', '2.0.21', '2.1.0']
2220
env:
2321
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2422
steps:

.github/workflows/dep_build_v3.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ jobs:
1616
matrix:
1717
java_version: ['8', '17', '21', '23']
1818
# Versions need to align with ones in 'main.yml' workflow
19-
# kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10.
20-
# https://youtrack.jetbrains.com/issue/KT-65156
21-
kotlin_version: ['1.8.10', '1.9.24', '2.0.21', '2.1.0-RC2']
19+
kotlin_version: ['1.9.24', '2.0.21', '2.1.0']
2220
env:
2321
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2422
steps:

.github/workflows/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@ jobs:
2828
max-parallel: 5
2929
matrix:
3030
java_version: ['8', '11', '17', '21', '23']
31-
# kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10.
32-
# https://youtrack.jetbrains.com/issue/KT-65156
33-
kotlin_version: ['1.8.10', '1.9.24', '2.0.21', '2.1.0-RC2']
31+
kotlin_version: ['1.9.24', '2.0.21', '2.1.0']
3432
include:
3533
- java_version: '8'
36-
kotlin_version: '1.8.10'
34+
kotlin_version: '1.9.24'
3735
release_build: 'R'
3836
env:
3937
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"

README.md

Lines changed: 4 additions & 3 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)
@@ -111,7 +111,8 @@ 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.19.x: Kotlin-core 1.9 - 2.1
115+
* Jackson 2.18.x: Kotlin-core 1.8 - 2.1
115116
* Jackson 2.17.x: Kotlin-core 1.7 - 2.0
116117
* Jackson 2.16.x: Kotlin-core 1.6 - 1.9
117118
* Jackson 2.15.x: Kotlin-core 1.5 - 1.8

pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@
6060
<javac.src.version>1.8</javac.src.version>
6161
<javac.target.version>1.8</javac.target.version>
6262

63-
<!-- kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10. -->
64-
<!-- https://youtrack.jetbrains.com/issue/KT-65156 -->
65-
<version.kotlin>1.8.10</version.kotlin>
63+
<version.kotlin>1.9.24</version.kotlin>
6664

6765
<!-- Generate PackageVersion.java into this directory. -->
6866
<packageVersion.dir>tools/jackson/module/kotlin</packageVersion.dir>

release-notes/CREDITS-2.x

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Contributors:
1818
# 2.19.0 (not yet released)
1919

2020
WrongWrong (@k163377)
21+
* #861: Update Kotlin to 1.9.24
2122
* #858: Refactor findDefaultCreator
2223
* #839: Remove useKotlinPropertyNameForGetter and unify with kotlinPropertyNameAsImplicitName
2324
* #835: Remove old SingletonSupport class and unified with KotlinFeature.SingletonSupport

release-notes/VERSION-2.x

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Co-maintainers:
1818

1919
2.19.0 (not yet released)
2020

21+
#861: Kotlin has been upgraded to 1.9.24.
2122
#858: Minor performance improvement of findDefaultCreator in edge cases.
2223
#839: Remove useKotlinPropertyNameForGetter and unify with kotlinPropertyNameAsImplicitName.
2324
#835: Remove old SingletonSupport class and unified with KotlinFeature.SingletonSupport.

0 commit comments

Comments
 (0)