From 91ff9be740403c2b34d40a590e6365d1a2ff3136 Mon Sep 17 00:00:00 2001 From: Osip Fatkullin Date: Wed, 16 Oct 2024 10:28:32 +0200 Subject: [PATCH] KTOR-7583 Enable missing native targets in ktor-serialization-kotlinx-xml --- buildSrc/src/main/kotlin/NativeUtils.kt | 3 +-- .../api/ktor-serialization-kotlinx-xml.klib.api | 2 +- .../ktor-serialization-kotlinx-xml/gradle.properties | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/kotlin/NativeUtils.kt b/buildSrc/src/main/kotlin/NativeUtils.kt index b528a1946d9..8f1917be847 100644 --- a/buildSrc/src/main/kotlin/NativeUtils.kt +++ b/buildSrc/src/main/kotlin/NativeUtils.kt @@ -48,8 +48,7 @@ fun Project.watchosTargets(): List = with(kotlin) { watchosArm64(), watchosSimulatorArm64(), // ktor-server-config-yaml: because of dependency on YAML library: https://github.com/Him188/yamlkt/issues/67 - // ktor-serialization-kotlinx-xml: because of dependency on xmlutil library: https://repo.maven.apache.org/maven2/io/github/pdvrieze/xmlutil/ // ktlint-disable max-line-length - if ((project.name != "ktor-server-config-yaml") && (project.name != "ktor-serialization-kotlinx-xml")) { + if (project.name != "ktor-server-config-yaml") { watchosDeviceArm64() } else { null diff --git a/ktor-shared/ktor-serialization/ktor-serialization-kotlinx/ktor-serialization-kotlinx-xml/api/ktor-serialization-kotlinx-xml.klib.api b/ktor-shared/ktor-serialization/ktor-serialization-kotlinx/ktor-serialization-kotlinx-xml/api/ktor-serialization-kotlinx-xml.klib.api index 9d9440d89ce..72cbb3d1d08 100644 --- a/ktor-shared/ktor-serialization/ktor-serialization-kotlinx/ktor-serialization-kotlinx-xml/api/ktor-serialization-kotlinx-xml.klib.api +++ b/ktor-shared/ktor-serialization/ktor-serialization-kotlinx/ktor-serialization-kotlinx-xml/api/ktor-serialization-kotlinx-xml.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] +// Targets: [androidNativeArm32, androidNativeArm64, androidNativeX64, androidNativeX86, iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64, watchosX64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/ktor-shared/ktor-serialization/ktor-serialization-kotlinx/ktor-serialization-kotlinx-xml/gradle.properties b/ktor-shared/ktor-serialization/ktor-serialization-kotlinx/ktor-serialization-kotlinx-xml/gradle.properties index 76afe8a8253..766fed50fa6 100644 --- a/ktor-shared/ktor-serialization/ktor-serialization-kotlinx/ktor-serialization-kotlinx-xml/gradle.properties +++ b/ktor-shared/ktor-serialization/ktor-serialization-kotlinx/ktor-serialization-kotlinx-xml/gradle.properties @@ -5,6 +5,3 @@ # xmlutil uses DOM API under the hood so it doesn't support Node.js. # Issue: https://github.com/pdvrieze/xmlutil/issues/83 target.js.nodeJs=false -# xmlutil doesn't provide android native targets -# Issue: https://github.com/pdvrieze/xmlutil/issues/240 -target.androidNative=false