feat: Add SPM sample

Author: noahsmartin

.github/workflows/build.yml

@@ -60,7 +60,7 @@ jobs:
       # sample projects don't use SPM for including Sentry. Only the DistributionSample uses local SPM.
       # Therefore, we only keep the local DistributionSample reference in the Package.swift as a workaround.
       - name: Only keep distribution lib and target in Package.swift
-        run: ./scripts/prepare-package.sh --only-keep-distribution true
+        run: ./scripts/prepare-package.sh --remove-binary-targets true
 
       - run: ./scripts/ci-select-xcode.sh 16.4
       - name: Setup Ruby
@@ -126,7 +126,7 @@ jobs:
       # sample projects don't use SPM for including Sentry. Only the DistributionSample uses local SPM.
       # Therefore, we only keep the local DistributionSample reference in the Package.swift as a workaround.
       - name: Only keep distribution lib and target in Package.swift
-        run: ./scripts/prepare-package.sh --only-keep-distribution true
+        run: ./scripts/prepare-package.sh --remove-binary-targets true
 
       - run: ./scripts/ci-select-xcode.sh 16.4
       - run: make init-ci-build

.github/workflows/release.yml

@@ -207,7 +207,7 @@ jobs:
             --is-pr "${{ github.event_name == 'pull_request' }}" \
             --change-path true
       - run: ./scripts/ci-select-xcode.sh 16.4
-      - run: swift build
+      - run: swift build --target SentrySwiftUI
       - name: Run CI Diagnostics
         if: failure()
         run: ./scripts/ci-diagnostics.sh

.github/workflows/test.yml

@@ -116,7 +116,8 @@ jobs:
             --package-file Package.swift \
             --is-pr "${{ github.event_name == 'pull_request' }}" \
             --remove-duplicate true \
-            --change-path false
+            --change-path false \
+            --remove-binary-targets true
       - run: rm -r Sentry.xcodeproj && rm -r Sentry.xcworkspace
       - run: set -o pipefail && NSUnbufferedIO=YES SKIP_BINARIES=1 xcodebuild test -scheme Sentry-Package -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=18.4,name=iPhone 16 Pro' | tee raw-test-output-distribution.log | xcbeautify --preserve-unbeautified
         shell: sh

.github/workflows/testflight.yml

@@ -55,7 +55,7 @@ jobs:
       # sample projects don't use SPM for including Sentry. Only the DistributionSample uses local SPM.
       # Therefore, we only keep the local DistributionSample reference in the Package.swift as a workaround.
       - name: Only keep distribution lib and target in Package.swift
-        run: ./scripts/prepare-package.sh --only-keep-distribution true
+        run: ./scripts/prepare-package.sh --remove-binary-targets true
 
       - run: make init-ci-build
       - run: make xcode-ci

.gitignore

@@ -95,6 +95,7 @@ Samples/visionOS-Swift/visionOS-Swift.xcodeproj
 Samples/watchOS-Swift/watchOS-Swift.xcodeproj
 Samples/SentrySampleShared/SentrySampleShared.xcodeproj
 Samples/DistributionSample/DistributionSample.xcodeproj
+Samples/SPM/SPM.xcodeproj
 TestSamples/SwiftUITestSample/SwiftUITestSample.xcodeproj
 TestSamples/SwiftUICrashTest/SwiftUICrashTest.xcodeproj
 

Makefile

@@ -184,6 +184,7 @@ xcode:
 	open Sentry.xcworkspace
 
 xcode-ci:
+	xcodegen --spec Samples/SPM/SPM.yml
 	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/SessionReplay-CameraTest/SessionReplay-CameraTest.yml
 	xcodegen --spec Samples/iOS-ObjectiveC/iOS-ObjectiveC.yml

Package.swift

@@ -74,8 +74,6 @@ var targets: [Target] = [
     .testTarget(name: "SentryDistributionTests", dependencies: ["SentryDistribution"], path: "Sources/SentryDistributionTests")
 ]
 
-let env = getenv("EXPERIMENTAL_SPM_BUILDS")
-if let env = env, String(cString: env, encoding: .utf8) == "1" {
     products.append(.library(name: "SentrySPM", type: .dynamic, targets: ["SentryObjc"]))
     targets.append(contentsOf: [
         // At least one source file is required, therefore we use a dummy class to satisfy the SPM build system
@@ -114,7 +112,6 @@ if let env = env, String(cString: env, encoding: .utf8) == "1" {
                 .headerSearchPath("SentryCrash/Reporting/Filters"),
                 .headerSearchPath("SentryCrash/Reporting/Filters/Tools")])
     ])
-}
 
 let package = Package(
     name: "Sentry",

Samples/SPM/SPM.xcconfig

@@ -0,0 +1,14 @@
+#include "../Shared/Config/_Common.xcconfig"
+
+PRODUCT_BUNDLE_IDENTIFIER = io.sentry.sample.SPM
+INFOPLIST_FILE = SPM/Info.plist
+CODE_SIGN_ENTITLEMENTS = SPM/SPM.entitlements
+
+PROVISIONING_PROFILE_SPECIFIER_Debug = match Development io.sentry.sample.SPM
+PROVISIONING_PROFILE_SPECIFIER_Release = match AppStore io.sentry.sample.SPM
+PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*] = $(PROVISIONING_PROFILE_SPECIFIER_$(CONFIGURATION))
+PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
+
+CODE_SIGN_STYLE = Manual
+
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator

Samples/SPM/SPM.yml

@@ -0,0 +1,35 @@
+# yaml-language-server: $schema=../../schema/xcodegen.schema.json
+
+name: SPM
+createIntermediateGroups: true
+generateEmptyDirectories: true
+configs:
+  Debug: debug
+  Release: release
+fileGroups:
+  - SPM.yml
+options:
+  bundleIdPrefix: io.sentry
+packages:
+  Sentry:
+    path: ../../
+targets:
+  SPM:
+    type: application
+    platform: auto
+    sources:
+      - SPM
+    dependencies:
+      - package: Sentry
+        products:
+          - SentrySwift
+    configFiles:
+      Debug: SPM.xcconfig
+      Release: SPM.xcconfig
+schemes:
+  SPM:
+    templates:
+      - SampleAppScheme
+    build:
+      targets:
+        SPM: all

Samples/SPM/SPM/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors": [
+    {
+      "idiom": "universal"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}