Skip to content

Commit 10b3b31

Browse files
authored
Merge pull request #803 from k163377/update-kotlin
Update Kotlin version
2 parents 73f4ebf + f9d4788 commit 10b3b31

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed

.github/workflows/dep_build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ jobs:
1717
matrix:
1818
java_version: ['8', '17', '21']
1919
# Versions need to align with ones in 'main.yml' workflow
20-
kotlin_version: ['1.7.22', '1.8.10', '1.9.23', '2.0.0-Beta4']
20+
# kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10.
21+
# https://youtrack.jetbrains.com/issue/KT-65156
22+
kotlin_version: ['1.8.10', '1.9.23', '2.0.0-Beta4']
2123
os: ['ubuntu-22.04']
2224
env:
2325
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"

.github/workflows/main.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ jobs:
2929
matrix:
3030
java_version: ['8', '11', '17', '21', '22']
3131
# 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
3233
# kotlin-reflect 2.0.0-Beta5 is not used because of KT-67209
33-
kotlin_version: ['1.7.22', '1.8.10', '1.9.23', '2.0.0-Beta4']
34+
kotlin_version: ['1.8.10', '1.9.23', '2.0.0-Beta4']
3435
include:
3536
- java_version: '8'
36-
kotlin_version: '1.7.22'
37+
kotlin_version: '1.8.10'
3738
release_build: 'R'
3839
env:
3940
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ println(arrayNode.toString()) // ["foo",true,1,1.0,"YmFy"]
110110
Different `kotlin-core` versions are supported by different Jackson Kotlin module minor versions.
111111
Here is an incomplete list of supported versions:
112112

113+
* Jackson 2.18.x: Kotlin-core 1.8 - 2.0
113114
* Jackson 2.17.x: Kotlin-core 1.7 - 2.0
114115
* Jackson 2.16.x: Kotlin-core 1.6 - 1.9
115116
* Jackson 2.15.x: Kotlin-core 1.5 - 1.8

pom.xml

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

65-
<version.kotlin>1.7.22</version.kotlin>
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>
6668

6769
<!-- Generate PackageVersion.java into this directory. -->
6870
<packageVersion.dir>com/fasterxml/jackson/module/kotlin</packageVersion.dir>

release-notes/VERSION-2.x

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Co-maintainers:
1818

1919
2.18.0 (not yet released)
2020

21+
#803: Kotlin has been upgraded to 1.8.10.
22+
The reason 1.8.22 is not used is to avoid KT-65156.
2123
#782: Content marked as deprecated has been reorganized.
2224
Several constructors and accessors to properties of KotlinModule.Builder that were marked as DeprecationLevel.ERROR have been removed.
2325
Also, the content marked as DeprecationLevel.WARNING is now DeprecationLevel.ERROR.

0 commit comments

Comments
 (0)