diff --git a/.github/workflows/dep_build.yml b/.github/workflows/dep_build.yml index c87d5c8a..dd3ba8c4 100644 --- a/.github/workflows/dep_build.yml +++ b/.github/workflows/dep_build.yml @@ -19,7 +19,7 @@ jobs: # Versions need to align with ones in 'main.yml' workflow # 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'] + kotlin_version: ['1.8.10', '1.9.23', '2.0.0'] os: ['ubuntu-22.04'] env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dd585831..09490cd1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,8 +30,7 @@ jobs: 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.8.10', '1.9.23', '2.0.0-Beta4'] + kotlin_version: ['1.8.10', '1.9.23', '2.0.0'] include: - java_version: '8' kotlin_version: '1.8.10' diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithDefaultArgumentsTest.kt index a36d7635..89a6ac4b 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithDefaultArgumentsTest.kt @@ -50,10 +50,12 @@ class DeserializeByConstructorWithDefaultArgumentsTest { val p31: NonNullObject = NonNullObject("31") ) - // #762 @Test(expected = KotlinReflectionInternalError::class) fun test32() { assertEquals(Dst32(), defaultMapper.readValue("{}")) + // TODO: #762 is resolved after Kotlin 2.0, so the reason why throw is done is to make CI with Kotlin 2.0 succeed. + // After upgrading to Kotlin 2.0, remove exception-related descriptions. + if (KotlinVersion.CURRENT.major >= 2) throw KotlinReflectionInternalError("") } data class Dst33( @@ -164,10 +166,12 @@ class DeserializeByConstructorWithDefaultArgumentsTest { val p63: NonNullObject = NonNullObject("63") ) - // #762 @Test(expected = KotlinReflectionInternalError::class) fun test64() { assertEquals(Dst64(), defaultMapper.readValue("{}")) + // TODO: #762 is resolved after Kotlin 2.0, so the reason why throw is done is to make CI with Kotlin 2.0 succeed. + // After upgrading to Kotlin 2.0, remove exception-related descriptions. + if (KotlinVersion.CURRENT.major >= 2) throw KotlinReflectionInternalError("") } data class Dst65( diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithDefaultArgumentsTest.kt index 133096d2..7753b710 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithDefaultArgumentsTest.kt @@ -50,10 +50,12 @@ class DeserializeByConstructorWithDefaultArgumentsTest { val p31: NullableObject? = NullableObject("31") ) - // #762 @Test(expected = KotlinReflectionInternalError::class) fun test32() { assertEquals(Dst32(), defaultMapper.readValue("{}")) + // TODO: #762 is resolved after Kotlin 2.0, so the reason why throw is done is to make CI with Kotlin 2.0 succeed. + // After upgrading to Kotlin 2.0, remove exception-related descriptions. + if (KotlinVersion.CURRENT.major >= 2) throw KotlinReflectionInternalError("") } data class Dst33( @@ -164,10 +166,12 @@ class DeserializeByConstructorWithDefaultArgumentsTest { val p63: NullableObject? = NullableObject("63") ) - // #762 @Test(expected = KotlinReflectionInternalError::class) fun test64() { assertEquals(Dst64(), defaultMapper.readValue("{}")) + // TODO: #762 is resolved after Kotlin 2.0, so the reason why throw is done is to make CI with Kotlin 2.0 succeed. + // After upgrading to Kotlin 2.0, remove exception-related descriptions. + if (KotlinVersion.CURRENT.major >= 2) throw KotlinReflectionInternalError("") } data class Dst65( diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithDefaultArgumentsTest.kt index 5c1af34d..1fbf3958 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithDefaultArgumentsTest.kt @@ -50,10 +50,12 @@ class DeserializeByConstructorWithDefaultArgumentsTest { val p31: Primitive = Primitive(31) ) - // #762 @Test(expected = KotlinReflectionInternalError::class) fun test32() { assertEquals(Dst32(), defaultMapper.readValue("{}")) + // TODO: #762 is resolved after Kotlin 2.0, so the reason why throw is done is to make CI with Kotlin 2.0 succeed. + // After upgrading to Kotlin 2.0, remove exception-related descriptions. + if (KotlinVersion.CURRENT.major >= 2) throw KotlinReflectionInternalError("") } data class Dst33( @@ -164,10 +166,12 @@ class DeserializeByConstructorWithDefaultArgumentsTest { val p63: Primitive = Primitive(63) ) - // #762 @Test(expected = KotlinReflectionInternalError::class) fun test64() { assertEquals(Dst64(), defaultMapper.readValue("{}")) + // TODO: #762 is resolved after Kotlin 2.0, so the reason why throw is done is to make CI with Kotlin 2.0 succeed. + // After upgrading to Kotlin 2.0, remove exception-related descriptions. + if (KotlinVersion.CURRENT.major >= 2) throw KotlinReflectionInternalError("") } data class Dst65(