diff --git a/plugins/package-managers/bower/src/main/kotlin/Model.kt b/plugins/package-managers/bower/src/main/kotlin/Model.kt index 4e4d88c4cc297..389ccefd898f1 100644 --- a/plugins/package-managers/bower/src/main/kotlin/Model.kt +++ b/plugins/package-managers/bower/src/main/kotlin/Model.kt @@ -21,13 +21,13 @@ package org.ossreviewtoolkit.plugins.packagemanagers.bower import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import kotlinx.serialization.builtins.ListSerializer import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonArray import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonTransformingSerializer import kotlinx.serialization.json.jsonArray +import kotlinx.serialization.serializer import org.ossreviewtoolkit.plugins.packagemanagers.bower.PackageMeta.Author @@ -98,7 +98,7 @@ internal fun parsePackageInfoJson(json: String): PackageInfo = JSON.decodeFromSt * serializer then can be simplified into a single item deserializer. See also * https://github.com/Kotlin/kotlinx.serialization/issues/1169#issuecomment-2083213759. */ -private object AuthorListSerializer : JsonTransformingSerializer>(ListSerializer(Author.serializer())) { +private object AuthorListSerializer : JsonTransformingSerializer>(serializer>()) { override fun transformDeserialize(element: JsonElement): JsonElement = JsonArray( element.jsonArray.map { item -> diff --git a/plugins/package-managers/cocoapods/src/main/kotlin/Podspec.kt b/plugins/package-managers/cocoapods/src/main/kotlin/Podspec.kt index 057edeb9e7bc8..40139a389834c 100644 --- a/plugins/package-managers/cocoapods/src/main/kotlin/Podspec.kt +++ b/plugins/package-managers/cocoapods/src/main/kotlin/Podspec.kt @@ -20,13 +20,13 @@ package org.ossreviewtoolkit.plugins.packagemanagers.cocoapods import kotlinx.serialization.Serializable -import kotlinx.serialization.builtins.serializer import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonPrimitive import kotlinx.serialization.json.JsonTransformingSerializer import kotlinx.serialization.json.jsonPrimitive +import kotlinx.serialization.serializer @Serializable internal data class Podspec( @@ -71,7 +71,7 @@ internal fun String.parsePodspec(): Podspec = JSON.decodeFromString(thi * 1. https://github.com/CocoaPods/Specs/blob/f75c24e7e9df1dac6ffa410a6fb30f01e026d4d6/Specs/8/5/e/SocketIOKit/2.0.1/SocketIOKit.podspec.json#L6-L9 * 2. https://github.com/CocoaPods/Specs/blob/f75c24e7e9df1dac6ffa410a6fb30f01e026d4d6/Specs/8/5/e/FirebaseObjects/0.0.1/FirebaseObjects.podspec.json#L6 */ -private object LicenseSerializer : JsonTransformingSerializer(String.serializer()) { +private object LicenseSerializer : JsonTransformingSerializer(serializer()) { override fun transformDeserialize(element: JsonElement): JsonElement = if (element is JsonObject) { element["type"]?.jsonPrimitive ?: JsonPrimitive("") diff --git a/plugins/scanners/scancode/src/main/kotlin/ScanCodeResultModel.kt b/plugins/scanners/scancode/src/main/kotlin/ScanCodeResultModel.kt index d73f286aba0bb..d5cf7b3cbcbe0 100644 --- a/plugins/scanners/scancode/src/main/kotlin/ScanCodeResultModel.kt +++ b/plugins/scanners/scancode/src/main/kotlin/ScanCodeResultModel.kt @@ -20,11 +20,10 @@ package org.ossreviewtoolkit.plugins.scanners.scancode import kotlinx.serialization.Serializable -import kotlinx.serialization.builtins.ListSerializer -import kotlinx.serialization.builtins.serializer import kotlinx.serialization.json.JsonArray import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonTransformingSerializer +import kotlinx.serialization.serializer import org.ossreviewtoolkit.utils.spdx.SpdxConstants import org.ossreviewtoolkit.utils.spdx.SpdxExpression @@ -205,7 +204,7 @@ data class LicenseReference( * A serializer that wraps an old primitive input option from ScanCode 3 into an array like it is for recent ScanCode * versions. Note that the input option format changed before the output format version property was introduced. */ -private object InputListSerializer : JsonTransformingSerializer>(ListSerializer(String.serializer())) { +private object InputListSerializer : JsonTransformingSerializer>(serializer>()) { override fun transformDeserialize(element: JsonElement): JsonElement = if (element !is JsonArray) JsonArray(listOf(element)) else element }