Skip to content

Commit

Permalink
Fix #632: drop Kotlin 1.4 support
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Mar 12, 2023
1 parent 8e7aeb9 commit 4efdaf8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ jobs:
fail-fast: false
matrix:
java_version: ['8', '11', '17']
kotlin_version: ['1.4.32', '1.5.32', '1.6.21', '1.7.20']
# Jackson 2.15 drops support for Kotlin 1.4, adds 1.8
kotlin_version: ['1.5.32', '1.6.21', '1.7.20', '1.8.10']
os: ['ubuntu-20.04']
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 @@ -130,6 +130,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.15.x: Kotlin-core 1.5 - 1.8
* Jackson 2.14.x: Kotlin-core 1.4 - 1.7
* Jackson 2.13.x: Kotlin-core 1.4 - 1.7

Expand Down
10 changes: 7 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,16 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- 16-Oct-2019, tatu: No point trying to target Java 7, Java 8 needed for build anyway -->
<javac.src.version>1.8</javac.src.version>
<javac.target.version>1.8</javac.target.version>

<version.kotlin>1.5.32</version.kotlin>

<!-- 11-Mar-2023, tatu: [kotlin#632] drops Kotlin 1.4 so target 1.5, but
build with 1.6.x for now
-->
<version.kotlin>1.6.21</version.kotlin>
<kotlin.compiler.languageVersion>1.5</kotlin.compiler.languageVersion>
<kotlin.compiler.apiVersion>1.5</kotlin.compiler.apiVersion>

<!-- Generate PackageVersion.java into this directory. -->
<packageVersion.dir>com/fasterxml/jackson/module/kotlin</packageVersion.dir>
<packageVersion.package>${project.groupId}.kotlin</packageVersion.package>
Expand Down

0 comments on commit 4efdaf8

Please sign in to comment.