Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/dep_build_v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ jobs:
matrix:
java_version: ['8', '17', '21', '23']
# Versions need to align with ones in 'main.yml' workflow
# kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10.
# https://youtrack.jetbrains.com/issue/KT-65156
kotlin_version: ['1.8.10', '1.9.24', '2.0.21', '2.1.0']
kotlin_version: ['1.9.24', '2.0.21', '2.1.0']
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
steps:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/dep_build_v3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ jobs:
matrix:
java_version: ['8', '17', '21', '23']
# Versions need to align with ones in 'main.yml' workflow
# kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10.
# https://youtrack.jetbrains.com/issue/KT-65156
kotlin_version: ['1.8.10', '1.9.24', '2.0.21', '2.1.0']
kotlin_version: ['1.9.24', '2.0.21', '2.1.0']
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
steps:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ jobs:
max-parallel: 5
matrix:
java_version: ['8', '11', '17', '21', '23']
# kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10.
# https://youtrack.jetbrains.com/issue/KT-65156
kotlin_version: ['1.8.10', '1.9.24', '2.0.21', '2.1.0']
kotlin_version: ['1.9.24', '2.0.21', '2.1.0']
include:
- java_version: '8'
kotlin_version: '1.8.10'
kotlin_version: '1.9.24'
release_build: 'R'
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ println(arrayNode.toString()) // ["foo",true,1,1.0,"YmFy"]
Different `kotlin-core` versions are supported by different Jackson Kotlin module minor versions.
Here is an incomplete list of supported versions:

* Jackson 2.19.x: Kotlin-core 1.9 - 2.1
* Jackson 2.18.x: Kotlin-core 1.8 - 2.1
* Jackson 2.17.x: Kotlin-core 1.7 - 2.0
* Jackson 2.16.x: Kotlin-core 1.6 - 1.9
Expand Down
4 changes: 1 addition & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@
<javac.src.version>1.8</javac.src.version>
<javac.target.version>1.8</javac.target.version>

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

<!-- Generate PackageVersion.java into this directory. -->
<packageVersion.dir>com/fasterxml/jackson/module/kotlin</packageVersion.dir>
Expand Down
1 change: 1 addition & 0 deletions release-notes/CREDITS-2.x
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Contributors:
# 2.19.0 (not yet released)

WrongWrong (@k163377)
* #861: Update Kotlin to 1.9.24
* #858: Refactor findDefaultCreator
* #839: Remove useKotlinPropertyNameForGetter and unify with kotlinPropertyNameAsImplicitName
* #835: Remove old SingletonSupport class and unified with KotlinFeature.SingletonSupport
Expand Down
1 change: 1 addition & 0 deletions release-notes/VERSION-2.x
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Co-maintainers:

2.19.0 (not yet released)

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