Skip to content

Commit

Permalink
Fixed Kotlin version used in CI
Browse files Browse the repository at this point in the history
At the same time, tests that began to fail due to bug fixes in the update have been corrected.
  • Loading branch information
k163377 committed Jun 9, 2024
1 parent 3d644fc commit fafc8ae
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dep_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,12 @@ class DeserializeByConstructorWithDefaultArgumentsTest {
val p31: NonNullObject = NonNullObject("31")
)

// #762
@Test(expected = KotlinReflectionInternalError::class)
fun test32() {
assertEquals(Dst32(), defaultMapper.readValue<Dst32>("{}"))
// 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(
Expand Down Expand Up @@ -164,10 +166,12 @@ class DeserializeByConstructorWithDefaultArgumentsTest {
val p63: NonNullObject = NonNullObject("63")
)

// #762
@Test(expected = KotlinReflectionInternalError::class)
fun test64() {
assertEquals(Dst64(), defaultMapper.readValue<Dst64>("{}"))
// 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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,12 @@ class DeserializeByConstructorWithDefaultArgumentsTest {
val p31: NullableObject? = NullableObject("31")
)

// #762
@Test(expected = KotlinReflectionInternalError::class)
fun test32() {
assertEquals(Dst32(), defaultMapper.readValue<Dst32>("{}"))
// 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(
Expand Down Expand Up @@ -164,10 +166,12 @@ class DeserializeByConstructorWithDefaultArgumentsTest {
val p63: NullableObject? = NullableObject("63")
)

// #762
@Test(expected = KotlinReflectionInternalError::class)
fun test64() {
assertEquals(Dst64(), defaultMapper.readValue<Dst64>("{}"))
// 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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,12 @@ class DeserializeByConstructorWithDefaultArgumentsTest {
val p31: Primitive = Primitive(31)
)

// #762
@Test(expected = KotlinReflectionInternalError::class)
fun test32() {
assertEquals(Dst32(), defaultMapper.readValue<Dst32>("{}"))
// 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(
Expand Down Expand Up @@ -164,10 +166,12 @@ class DeserializeByConstructorWithDefaultArgumentsTest {
val p63: Primitive = Primitive(63)
)

// #762
@Test(expected = KotlinReflectionInternalError::class)
fun test64() {
assertEquals(Dst64(), defaultMapper.readValue<Dst64>("{}"))
// 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(
Expand Down

0 comments on commit fafc8ae

Please sign in to comment.