Skip to content

[3/4] chore(samples): Remove CocoaPods sample and podspec tooling, making SPM the sole Apple sample path#558

Merged
buenaflor merged 0 commit into
feat/spm4kmp-phase1-migrationfrom
feat/spm4kmp-phase2-samples
Jun 10, 2026
Merged

[3/4] chore(samples): Remove CocoaPods sample and podspec tooling, making SPM the sole Apple sample path#558
buenaflor merged 0 commit into
feat/spm4kmp-phase1-migrationfrom
feat/spm4kmp-phase2-samples

Conversation

@buenaflor

Copy link
Copy Markdown
Contributor

Phase 3 of the stacked spm4Kmp migration (stacked on #557). Now that the SDK's internal Apple build no longer uses the Kotlin CocoaPods plugin, this PR removes the dead CocoaPods sample and internal build tooling and makes the SPM sample the sole Apple sample validation path.

Why: keeping the CocoaPods sample and SDK podspec around after the spm4Kmp switch is pure dead weight — the SDK module no longer applies the native.cocoapods plugin, so generateDummyFramework/syncFramework and sentry_kotlin_multiplatform.podspec are unused. Consolidating on the SPM sample keeps a single, representative consumer build in CI.

What changed:

  • Makefile buildAppleSamples now xcodebuilds the SPM sample (kmp-app-spm/iosApp.xcodeproj, scheme iosApp, Debug/iphonesimulator/arm64) and drops podInstall/pod update. kotlin-multiplatform.yml inherits this via make buildAppleSamples; test-samples is unaffected.
  • Removed the kmp-app-cocoapods sample entirely (its settings.gradle.kts includes and .run/*-cocoapods.run.xml), and repointed kmp-app-spm:desktopApp to the SPM shared module (it had a stray dependency on the cocoapods shared module).
  • Deleted the SDK sentry_kotlin_multiplatform.podspec and the unused native.cocoapods plugin classpath entry (root build.gradle.kts + Config.cocoapods).
  • Rewrote scripts/update-cocoa.sh to bump Config.kt, the plugin gradle.properties, and the SPM sample's SwiftPM pin in project.pbxproj, then refresh Package.resolved via xcodebuild -resolvePackageDependencies (dropped the podspec/generateDummyFramework/pod update steps).
  • Pointed scripts/bump-version.sh at Config.kt for the Cocoa compatibility-table version (podspec is gone) and narrowed the sample prepare scripts to kmp-app-spm.

Consumer-facing Gradle plugin CocoaPods support (installSentryForCocoapods, CocoapodsAutoInstallExtension, CocoaFrameworkLinker) is intentionally untouched.

Verification: SPM sample iOS xcodebuild BUILD SUCCEEDED (Xcode 26.1.1), ./gradlew build -p sentry-samples, and spotlessApply/detekt/apiCheck all green; update-cocoa.sh get-version resolves correctly.

Note: the watchosArm32 re-enable is still tracked in the earlier stack PR and is out of scope here.

Made with Cursor

@github-actions

github-actions Bot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor
Fails
🚫 Please consider adding a changelog entry for the next release.

Instructions and example for changelog

Please add an entry to CHANGELOG.md to the "Unreleased" section. Make sure the entry includes this PR's number.

Example:

## Unreleased

### Features

- Remove CocoaPods sample and podspec tooling, making SPM the sole Apple sample path ([#558](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/558))

If none of the above apply, you can opt out of this check by adding #skip-changelog to the PR description or adding a skip-changelog label.

Generated by 🚫 dangerJS against 9ead63f

@buenaflor buenaflor force-pushed the feat/spm4kmp-phase2-samples branch from 2b44fe4 to 0fca03c Compare June 9, 2026 19:55
@buenaflor buenaflor changed the title [PR 3] refactor: migrate from cocoapods plugin to spm4Kmp [3/4] chore(samples): Remove CocoaPods sample and podspec tooling, making SPM the sole Apple sample path Jun 9, 2026
@buenaflor buenaflor force-pushed the feat/spm4kmp-phase2-samples branch from 0fca03c to df55744 Compare June 10, 2026 10:59
@buenaflor buenaflor force-pushed the feat/spm4kmp-phase1-migration branch 2 times, most recently from b654bf8 to f5cef29 Compare June 10, 2026 11:14
@buenaflor buenaflor force-pushed the feat/spm4kmp-phase2-samples branch from df55744 to 9ead63f Compare June 10, 2026 11:14
@buenaflor buenaflor merged commit 50ba5fb into feat/spm4kmp-phase1-migration Jun 10, 2026
11 of 13 checks passed
@buenaflor buenaflor force-pushed the feat/spm4kmp-phase1-migration branch from f5cef29 to 50ba5fb Compare June 10, 2026 11:18
@buenaflor buenaflor deleted the feat/spm4kmp-phase2-samples branch June 10, 2026 11:18
@buenaflor buenaflor force-pushed the feat/spm4kmp-phase2-samples branch from 9ead63f to 50ba5fb Compare June 10, 2026 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant