From 9753f637f10c7878a0e567ecf7ca63da3509b12c Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 15 Jul 2023 00:06:40 +0900 Subject: [PATCH 1/5] Upgrade Kotlin to 1.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a46dce48..0ef4d293 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 1.8 1.8 - 1.5.32 + 1.6.21 com/fasterxml/jackson/module/kotlin From a8947185ae1dfd1fe6753ded730d79f87b271d96 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 15 Jul 2023 00:07:27 +0900 Subject: [PATCH 2/5] Fix test --- .../fasterxml/jackson/module/kotlin/test/github/Github356.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github356.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github356.kt index 496b5cb7..885d74e4 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github356.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github356.kt @@ -42,8 +42,8 @@ class TestGithub356 { } } -// Deprecated usage kept at 1.5.0 upgrade; delete in the future -inline class InlineClass(val value: String) +@JvmInline +value class InlineClass(val value: String) @JsonDeserialize(builder = ClassWithInlineMember.JacksonBuilder::class) data class ClassWithInlineMember(val inlineClassProperty: InlineClass) { From 57a1185d0b781053443187ed46b303f74b9b8f06 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 15 Jul 2023 00:08:55 +0900 Subject: [PATCH 3/5] Update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a8fa52f3..384ce0f3 100644 --- a/README.md +++ b/README.md @@ -129,6 +129,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.16.x: Kotlin-core 1.6 - 1.9 * Jackson 2.15.x: Kotlin-core 1.5 - 1.8 * Jackson 2.14.x: Kotlin-core 1.4 - 1.8 * Jackson 2.13.x: Kotlin-core 1.4 - 1.7 From e02404c1920f002e9f67d797ab30f2b233adc3ec Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 15 Jul 2023 00:12:08 +0900 Subject: [PATCH 4/5] Update CI WF --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 326dbfc6..d3db2e4c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,8 +27,7 @@ jobs: fail-fast: false matrix: java_version: ['8', '11', '17'] - # Jackson 2.15 drops support for Kotlin 1.4 - kotlin_version: ['1.5.32', '1.6.21', '1.7.20', '1.8.10', '1.8.20-RC'] + kotlin_version: ['1.6.21', '1.7.20', '1.8.22', '1.9.0'] os: ['ubuntu-20.04'] env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" From f669a3e4abe1675c5efb2f697b4ebe0f689745c6 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 15 Jul 2023 00:31:37 +0900 Subject: [PATCH 5/5] Update release notes wrt #684 --- release-notes/CREDITS-2.x | 1 + release-notes/VERSION-2.x | 1 + 2 files changed, 2 insertions(+) diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x index fdb6dc75..c05e769b 100644 --- a/release-notes/CREDITS-2.x +++ b/release-notes/CREDITS-2.x @@ -18,6 +18,7 @@ Contributors: # 2.16.0 (not yet released) WrongWrong (@k163377) +* #684: Update Kotlin Version to 1.6 * #682: Remove MissingKotlinParameterException and replace with MismatchedInputException # 2.15.2 diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index bf1c4b9a..ed9728ef 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -18,6 +18,7 @@ Co-maintainers: 2.16.0 (not yet released) +#684: Kotlin 1.5 has been deprecated and the minimum supported Kotlin version will be updated to 1.6. #682: Remove MissingKotlinParameterException and replace with MismatchedInputException This change removes MissingKotlinParameterException and resolves #617. This change is a prerequisite for future work to improve performance.