Skip to content

Commit 4480101

Browse files
authored
Merge pull request #861 from k163377/update-kotlin
Update Kotlin to 1.9.24
2 parents c42d69c + 18f7886 commit 4480101

File tree

7 files changed

+8
-13
lines changed

7 files changed

+8
-13
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']
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']
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']
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +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.19.x: Kotlin-core 1.9 - 2.1
114115
* 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

pom.xml

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

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

6967
<!-- Generate PackageVersion.java into this directory. -->
7068
<packageVersion.dir>com/fasterxml/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)