From 667d5d456d30e3b14b8c4af761f033a936d845a9 Mon Sep 17 00:00:00 2001 From: Daniel Santiago Date: Tue, 4 Feb 2025 16:49:06 -0500 Subject: [PATCH] Add watchosDeviceArm64 to Okio projects As of [Okio 3.7.0](https://github.com/square/okio/blob/master/CHANGELOG.md#version-369) (currently using `3.9.0`) projects that depend on Okio can start building and releasing for `watchosDeviceArm64`. --- .../src/main/kotlin/native-targets-conventions.gradle.kts | 4 ++-- .../json-okio/api/kotlinx-serialization-json-okio.klib.api | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/native-targets-conventions.gradle.kts b/buildSrc/src/main/kotlin/native-targets-conventions.gradle.kts index d5cf6249f2..bb6f45bf49 100644 --- a/buildSrc/src/main/kotlin/native-targets-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/native-targets-conventions.gradle.kts @@ -36,13 +36,13 @@ kotlin { // Tier 3 mingwX64() + watchosDeviceArm64() // https://github.com/square/okio/issues/1242#issuecomment-1759357336 if (doesNotDependOnOkio(project)) { androidNativeArm32() androidNativeArm64() androidNativeX86() androidNativeX64() - watchosDeviceArm64() // Deprecated, but not removed linuxArm32Hfp() @@ -61,4 +61,4 @@ kotlin { fun doesNotDependOnOkio(project: Project): Boolean { return !project.name.contains("json-okio") && !project.name.contains("json-tests") -} \ No newline at end of file +} diff --git a/formats/json-okio/api/kotlinx-serialization-json-okio.klib.api b/formats/json-okio/api/kotlinx-serialization-json-okio.klib.api index dd78917964..7d9a9b98e1 100644 --- a/formats/json-okio/api/kotlinx-serialization-json-okio.klib.api +++ b/formats/json-okio/api/kotlinx-serialization-json-okio.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, wasmWasi, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, wasmWasi, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64, watchosX64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true