diff --git a/buildSrc/src/main/kotlin/BuildConstants.kt b/buildSrc/src/main/kotlin/BuildConstants.kt index 6db356cf..5087d104 100644 --- a/buildSrc/src/main/kotlin/BuildConstants.kt +++ b/buildSrc/src/main/kotlin/BuildConstants.kt @@ -23,6 +23,7 @@ object BuildConstants { const val fabricApiVersion = "0.55.3+1.19" const val fabricLanguageKotlinVersion = "1.8.0+kotlin.1.7.0" + // TODO: update to 5.4 when released for compatiblity with Kotlin 1.7 const val kotestVersion = "5.3.0" const val mockkVersion = "1.12.4" diff --git a/fabrikmc-nbt/src/main/kotlin/net/axay/fabrik/nbt/serialization/internal/ListLikeSerialization.kt b/fabrikmc-nbt/src/main/kotlin/net/axay/fabrik/nbt/serialization/internal/CollectionLikeSerialization.kt similarity index 69% rename from fabrikmc-nbt/src/main/kotlin/net/axay/fabrik/nbt/serialization/internal/ListLikeSerialization.kt rename to fabrikmc-nbt/src/main/kotlin/net/axay/fabrik/nbt/serialization/internal/CollectionLikeSerialization.kt index a282e7ff..cbddfd8d 100644 --- a/fabrikmc-nbt/src/main/kotlin/net/axay/fabrik/nbt/serialization/internal/ListLikeSerialization.kt +++ b/fabrikmc-nbt/src/main/kotlin/net/axay/fabrik/nbt/serialization/internal/CollectionLikeSerialization.kt @@ -13,16 +13,16 @@ internal val byteSerializer = serializer() internal val intSerializer = serializer() internal val longSerializer = serializer() -private val listLikeSerializerClass = Class.forName("kotlinx.serialization.internal.ListLikeSerializer").kotlin +private val collectionLikeSerializerClass = Class.forName("kotlinx.serialization.internal.CollectionLikeSerializer").kotlin @Suppress("unchecked_cast") -private val listLikeElementSerializerField = listLikeSerializerClass.declaredMemberProperties +private val collectionLikeElementSerializerField = collectionLikeSerializerClass.declaredMemberProperties .first { it.name == "elementSerializer" } .apply { isAccessible = true } as KProperty1> internal val Any.elementSerializer: KSerializer<*>? - get() = if (listLikeSerializerClass.isInstance(this)) { - listLikeElementSerializerField.get(this) + get() = if (collectionLikeSerializerClass.isInstance(this)) { + collectionLikeElementSerializerField.get(this) } else { null }