Skip to content

Commit

Permalink
Merge pull request #803 from k163377/update-kotlin
Browse files Browse the repository at this point in the history
Update Kotlin version
  • Loading branch information
k163377 authored Jun 8, 2024
2 parents 73f4ebf + f9d4788 commit 10b3b31
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 4 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/dep_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ jobs:
matrix:
java_version: ['8', '17', '21']
# Versions need to align with ones in 'main.yml' workflow
kotlin_version: ['1.7.22', '1.8.10', '1.9.23', '2.0.0-Beta4']
# 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.23', '2.0.0-Beta4']
os: ['ubuntu-22.04']
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ jobs:
matrix:
java_version: ['8', '11', '17', '21', '22']
# 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-reflect 2.0.0-Beta5 is not used because of KT-67209
kotlin_version: ['1.7.22', '1.8.10', '1.9.23', '2.0.0-Beta4']
kotlin_version: ['1.8.10', '1.9.23', '2.0.0-Beta4']
include:
- java_version: '8'
kotlin_version: '1.7.22'
kotlin_version: '1.8.10'
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 @@ -110,6 +110,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.18.x: Kotlin-core 1.8 - 2.0
* Jackson 2.17.x: Kotlin-core 1.7 - 2.0
* Jackson 2.16.x: Kotlin-core 1.6 - 1.9
* Jackson 2.15.x: Kotlin-core 1.5 - 1.8
Expand Down
4 changes: 3 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@
<javac.src.version>1.8</javac.src.version>
<javac.target.version>1.8</javac.target.version>

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

<!-- Generate PackageVersion.java into this directory. -->
<packageVersion.dir>com/fasterxml/jackson/module/kotlin</packageVersion.dir>
Expand Down
2 changes: 2 additions & 0 deletions release-notes/VERSION-2.x
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Co-maintainers:

2.18.0 (not yet released)

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

0 comments on commit 10b3b31

Please sign in to comment.