diff --git a/.github/workflows/test-main.yml b/.github/workflows/test-main.yml index 850f48e..18dcbaa 100644 --- a/.github/workflows/test-main.yml +++ b/.github/workflows/test-main.yml @@ -35,23 +35,23 @@ jobs: fail-fast: false matrix: # LTS versions, latest version (if exists) - java-version: [ '8', '11', '17', '21' ] + java-version: [ '8', '11', '17', '21', '22' ] # Minimum version, latest release version, latest pre-release version (if exists) kotlin: - name: '1.8.22' version: '1.8.22' k2: false - - name: '1.9.21' - version: '1.9.21' + - name: '1.9.23' + version: '1.9.23' k2: false - - name: '1.9.21 K2' - version: '1.9.21' + - name: '1.9.23 K2' + version: '1.9.23' k2: true - - name: '2.0.0-Beta3' - version: '2.0.0-Beta3' + - name: '2.0.0-Beta5' + version: '2.0.0-Beta5' k2: false - - name: '2.0.0-Beta3 K2' - version: '2.0.0-Beta3' + - name: '2.0.0-Beta5 K2' + version: '2.0.0-Beta5' k2: true env: KOTLIN_VERSION: ${{ matrix.kotlin.version }} diff --git a/build.gradle.kts b/build.gradle.kts index 8673ad9..3efde60 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ val jacksonVersion = libs.versions.jackson.get() val generatedSrcPath = "${layout.buildDirectory.get()}/generated/kotlin" group = groupStr -version = "${jacksonVersion}-beta12" +version = "${jacksonVersion}-beta13" repositories { mavenCentral() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8228bfe..4736f22 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] kotlin = "1.8.22" # Mainly for CI, it can be rewritten by environment variable. -jackson = "2.17.0" +jackson = "2.17.1" # test libs junit = "5.10.2" diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/JmClass.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/JmClass.kt index 0bceedc..6392175 100644 --- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/JmClass.kt +++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/JmClass.kt @@ -1,6 +1,3 @@ -// Visitor API has already been deprecated, but the error is being suppressed for now. -@file:Suppress("DEPRECATION_ERROR") - package io.github.projectmapk.jackson.module.kogera import kotlinx.metadata.ClassKind @@ -12,10 +9,10 @@ import kotlinx.metadata.KmProperty import kotlinx.metadata.KmType import kotlinx.metadata.jvm.getterSignature import kotlinx.metadata.jvm.signature +import kotlinx.metadata.kind import java.lang.reflect.Constructor import java.lang.reflect.Field import java.lang.reflect.Method -import kotlinx.metadata.internal.metadata.deserialization.Flags as ProtoFlags // Jackson Metadata Class internal sealed interface JmClass { @@ -61,7 +58,7 @@ private class JmClassImpl( override val properties: List private val companionPropName: String? = kmClass.companionObject - override val kind: ClassKind = ClassKind.values()[ProtoFlags.CLASS_KIND.get(kmClass.flags).number] + override val kind: ClassKind = kmClass.kind override val constructors: List = kmClass.constructors override val sealedSubclasses: List = kmClass.sealedSubclasses override val inlineClassUnderlyingType: KmType? = kmClass.inlineClassUnderlyingType