Merge pull request #175 from ProjectMapK/upd-versions

Update Kotlin and Jackson versions

Author: k163377

.github/workflows/test-main.yml

@@ -38,9 +38,6 @@ jobs:
         java-version: [ '8', '11', '17', '20' ]
         # Minimum version, latest release version, latest pre-release version (if exists)
         kotlin:
-          - name: '1.7.21'
-            version: '1.7.21'
-            k2: false
           - name: '1.8.22'
             version: '1.8.22'
             k2: false
@@ -50,6 +47,12 @@ jobs:
           - name: '1.9.20 K2'
             version: '1.9.20'
             k2: true
+          - name: '2.0.0-Beta1'
+            version: '2.0.0-Beta1'
+            k2: false
+          - name: '2.0.0-Beta1 K2'
+            version: '2.0.0-Beta1'
+            k2: true
     env:
       KOTLIN_VERSION: ${{ matrix.kotlin.version }}
       USE_K2: ${{ matrix.kotlin.k2 }}

README.md

@@ -34,19 +34,18 @@ This project makes several disruptive changes to achieve more `Kotlin-like` beha
 Details are summarized in [KogeraSpecificImplementations](./docs/KogeraSpecificImplementations.md).
 
 # Compatibility
-- `jackson 2.15.0`
+- `jackson 2.16.x`
 - `Java 8+`
-- `Kotlin 1.7.21+`
+- `Kotlin 1.8.22+`
 
 ## About compatibility checks
 Compatibility checks for `Java` and `Kotlin` are done by `CI` grid tests.
 
 The `Java` test covers all currently supported LTS versions and the latest versions.  
 Currently 8,11,17 and 20 are covered.
 
-`Kotlin` is tested on the latest patch version and the latest `Beta` or `RC` version within each minor version since 1.7.21.  
-Currently 1.7.21 and 1.9.20-Beta are covered.  
-I hope to lower this version in the future, but currently the minimum `Kotlin` version that can be supported is 1.7 due to `kotlinx-metadata-jvm` constraints.
+`Kotlin` is tested with the latest patch version and the latest `Beta` or `RC` version within each minor version after the minimum version.  
+The `Kotlin` version is the lowest version available with the latest `kotlinx-metadata-jvm`.
 
 # Installation
 The package is temporarily published in `JitPack`.  

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     `maven-publish` // for JitPack
 
-    val kotlinVersion: String = System.getenv("KOTLIN_VERSION")?.takeIf { it.isNotEmpty() } ?: "1.7.21"
+    val kotlinVersion: String = System.getenv("KOTLIN_VERSION")?.takeIf { it.isNotEmpty() } ?: "1.8.22"
     kotlin("jvm") version kotlinVersion
 
     java
@@ -10,7 +10,7 @@ plugins {
 
 // Since group cannot be obtained by generateKogeraVersion, it is defined as a constant.
 val groupStr = "io.github.projectmapk"
-val jacksonVersion = "2.15.3"
+val jacksonVersion = "2.16.0"
 val generatedSrcPath = "${layout.buildDirectory.get()}/generated/kotlin"
 
 group = groupStr
@@ -22,7 +22,7 @@ repositories {
 
 dependencies {
     implementation(kotlin("stdlib"))
-    implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.7.0")
 
     api("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}")
     api("com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}")

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github356.kt

@@ -9,22 +9,6 @@ import org.junit.jupiter.api.Test
 class TestGithub356 {
     private val mapper = jacksonObjectMapper()
 
-    @Test
-    fun deserializeInlineClass() {
-        assertEquals(
-            ClassWithInlineMember(InlineClass("bar")),
-            mapper.readValue<ClassWithInlineMember>("""{"inlineClassProperty":"bar"}""")
-        )
-    }
-
-    @Test
-    fun serializeInlineClass() {
-        assertEquals(
-            """{"inlineClassProperty":"bar"}""",
-            mapper.writeValueAsString(ClassWithInlineMember(InlineClass("bar")))
-        )
-    }
-
     @Test
     fun deserializeValueClass() {
         assertEquals(
@@ -42,16 +26,6 @@ class TestGithub356 {
     }
 }
 
-// Deprecated usage kept at 1.5.0 upgrade; delete in the future
-inline class InlineClass(val value: String)
-
-@JsonDeserialize(builder = ClassWithInlineMember.JacksonBuilder::class)
-data class ClassWithInlineMember(val inlineClassProperty: InlineClass) {
-    data class JacksonBuilder constructor(val inlineClassProperty: String) {
-        fun build() = ClassWithInlineMember(InlineClass(inlineClassProperty))
-    }
-}
-
 @JvmInline
 value class ValueClass(val value: String)