Skip to content

Commit f7815e2

Browse files
buenaflorclaudecursoragent
committed
feat(apple): Re-enable watchosArm32 via spm4Kmp 1.9.3
spm4Kmp 1.9.3 adds armv7k (watchosArm32) support to its AppleCompileTarget enum, so it now generates the exported cocoapods.Sentry cinterop for that target. Bump Config.spmForKmpVersion to 1.9.3 and re-add watchosArm32() to the appleTargets list (the swiftPackageConfig forEach iterates that list). This restores the published target, so validateDistributions (expects watchosarm32, 20 artifacts) and scripts/build-apple.sh stay consistent. apiCheck is unaffected (android/jvm dumps only). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 577e3e6 commit f7815e2

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

buildSrc/src/main/java/Config.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object Config {
77
val multiplatform = "multiplatform"
88
val cocoapods = "native.cocoapods"
99
val spmForKmp = "io.github.frankois944.spmForKmp"
10-
val spmForKmpVersion = "1.9.2"
10+
val spmForKmpVersion = "1.9.3"
1111
val jetpackCompose = "org.jetbrains.compose"
1212
val kotlinCompose = "org.jetbrains.kotlin.plugin.compose"
1313
val gradleMavenPublishPlugin = "com.vanniktech.maven.publish"

sentry-kotlin-multiplatform/build.gradle.kts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,12 @@ kotlin {
5959
jvm()
6060

6161
// Apple targets are declared once here and reused for the spm4Kmp swiftPackageConfig below.
62-
// TODO(spm4Kmp): watchosArm32 (armv7k) is temporarily disabled. spm4Kmp 1.9.2 has no
63-
// watchosArm32 entry in its AppleCompileTarget enum, so it cannot generate the exported
64-
// `cocoapods.Sentry` cinterop for it. K/N cinterop itself supports armv7k, so this is purely a
65-
// plugin gap (reported upstream). Re-add it to this list once the plugin adds armv7k support
66-
// (or via a manual header cinterop fallback).
6762
val appleTargets =
6863
listOf(
6964
iosArm64(),
7065
iosSimulatorArm64(),
7166
iosX64(),
67+
watchosArm32(),
7268
watchosArm64(),
7369
watchosX64(),
7470
watchosSimulatorArm64(),

0 commit comments

Comments
 (0)