ref: Migrate sample apps to package references

Makefile

@@ -474,7 +474,6 @@ build-sample-iOS-ObjectiveCpp-NoModules:
 # Builds the iOS-Swift sample app for the iOS Simulator.
 .PHONY: build-sample-iOS-Swift
 build-sample-iOS-Swift:
-	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/iOS-Swift/iOS-Swift.yml
 	set -o pipefail && xcodebuild \
 		-workspace Sentry.xcworkspace \
@@ -487,7 +486,6 @@ build-sample-iOS-Swift:
 # Builds the iOS-Swift6 sample app for the iOS Simulator.
 .PHONY: build-sample-iOS-Swift6
 build-sample-iOS-Swift6:
-	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/iOS-Swift6/iOS-Swift6.yml
 	set -o pipefail && xcodebuild \
 		-workspace Sentry.xcworkspace \
@@ -500,7 +498,6 @@ build-sample-iOS-Swift6:
 # Builds the iOS-SwiftUI sample app for the iOS Simulator.
 .PHONY: build-sample-iOS-SwiftUI
 build-sample-iOS-SwiftUI:
-	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/iOS-SwiftUI/iOS-SwiftUI.yml
 	set -o pipefail && xcodebuild \
 		-workspace Sentry.xcworkspace \
@@ -513,7 +510,6 @@ build-sample-iOS-SwiftUI:
 # Builds the iOS-SwiftUI-Widgets sample app for the iOS Simulator.
 .PHONY: build-sample-iOS-SwiftUI-Widgets
 build-sample-iOS-SwiftUI-Widgets:
-	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/iOS-SwiftUI-Widgets/iOS-SwiftUI-Widgets.yml
 	set -o pipefail && xcodebuild \
 		-workspace Sentry.xcworkspace \
@@ -526,7 +522,6 @@ build-sample-iOS-SwiftUI-Widgets:
 # Builds the iOS-ObjectiveC sample app for the iOS Simulator.
 .PHONY: build-sample-iOS-ObjectiveC
 build-sample-iOS-ObjectiveC:
-	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/iOS-ObjectiveC/iOS-ObjectiveC.yml
 	set -o pipefail && xcodebuild \
 		-workspace Sentry.xcworkspace \
@@ -565,7 +560,6 @@ build-sample-iOS-ObjectiveC-Static:
 # Builds the iOS15-SwiftUI sample app for the iOS Simulator.
 .PHONY: build-sample-iOS15-SwiftUI
 build-sample-iOS15-SwiftUI:
-	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/iOS15-SwiftUI/iOS15-SwiftUI.yml
 	set -o pipefail && xcodebuild \
 		-workspace Sentry.xcworkspace \
@@ -578,7 +572,6 @@ build-sample-iOS15-SwiftUI:
 # Builds the SessionReplay-CameraTest sample app for the iOS Simulator.
 .PHONY: build-sample-SessionReplay-CameraTest
 build-sample-SessionReplay-CameraTest:
-	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/SessionReplay-CameraTest/SessionReplay-CameraTest.yml
 	set -o pipefail && xcodebuild \
 		-workspace Sentry.xcworkspace \
@@ -591,7 +584,6 @@ build-sample-SessionReplay-CameraTest:
 # Builds the macOS-Swift sample app.
 .PHONY: build-sample-macOS-Swift
 build-sample-macOS-Swift:
-	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/macOS-Swift/macOS-Swift.yml
 	set -o pipefail && xcodebuild \
 		-workspace Sentry.xcworkspace \
@@ -603,7 +595,6 @@ build-sample-macOS-Swift:
 # Builds the macOS-SwiftUI sample app.
 .PHONY: build-sample-macOS-SwiftUI
 build-sample-macOS-SwiftUI:
-	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/macOS-SwiftUI/macOS-SwiftUI.yml
 	set -o pipefail && xcodebuild \
 		-workspace Sentry.xcworkspace \
@@ -615,7 +606,6 @@ build-sample-macOS-SwiftUI:
 # Builds the tvOS-Swift sample app for the tvOS Simulator.
 .PHONY: build-sample-tvOS-Swift
 build-sample-tvOS-Swift:
-	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/tvOS-Swift/tvOS-Swift.yml
 	set -o pipefail && xcodebuild \
 		-workspace Sentry.xcworkspace \
@@ -628,7 +618,6 @@ build-sample-tvOS-Swift:
 # Builds the visionOS-Swift sample app for the visionOS Simulator.
 .PHONY: build-sample-visionOS-Swift
 build-sample-visionOS-Swift:
-	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/visionOS-Swift/visionOS-Swift.yml
 	set -o pipefail && xcodebuild \
 		-workspace Sentry.xcworkspace \
@@ -641,7 +630,6 @@ build-sample-visionOS-Swift:
 # Builds the watchOS-Swift sample app for the watchOS Simulator.
 .PHONY: build-sample-watchOS-Swift
 build-sample-watchOS-Swift:
-	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/watchOS-Swift/watchOS-Swift.yml
 	set -o pipefail && xcodebuild \
 		-workspace Sentry.xcworkspace \
@@ -1239,8 +1227,7 @@ xcode: xcode-ci
 # Generates Xcode projects for all sample apps using xcodegen.
 # Run a specific sample with make xcode-ci-<name>, e.g. make xcode-ci-iOS-Swift.
 .PHONY: xcode-ci
-xcode-ci: xcode-ci-SentrySampleShared \
-	xcode-ci-SPM \
+xcode-ci: xcode-ci-SPM \
 	xcode-ci-SessionReplay-CameraTest \
 	xcode-ci-iOS-ObjectiveC \
 	xcode-ci-iOS-ObjectiveC-Dynamic \
@@ -1269,16 +1256,12 @@ xcode-ci: xcode-ci-SentrySampleShared \
 xcode-ci-SPM:
 	xcodegen --spec Samples/SPM/SPM.yml
 
-.PHONY: xcode-ci-SentrySampleShared
-xcode-ci-SentrySampleShared:
-	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
-
 .PHONY: xcode-ci-SessionReplay-CameraTest
-xcode-ci-SessionReplay-CameraTest: xcode-ci-SentrySampleShared
+xcode-ci-SessionReplay-CameraTest:
 	xcodegen --spec Samples/SessionReplay-CameraTest/SessionReplay-CameraTest.yml
 
 .PHONY: xcode-ci-iOS-ObjectiveC
-xcode-ci-iOS-ObjectiveC: xcode-ci-SentrySampleShared
+xcode-ci-iOS-ObjectiveC:
 	xcodegen --spec Samples/iOS-ObjectiveC/iOS-ObjectiveC.yml
 
 .PHONY: xcode-ci-iOS-ObjectiveC-Dynamic
@@ -1294,63 +1277,63 @@ xcode-ci-iOS-ObjectiveCpp-NoModules:
 	xcodegen --spec Samples/iOS-ObjectiveCpp-NoModules/iOS-ObjectiveCpp-NoModules.yml
 
 .PHONY: xcode-ci-iOS-Swift
-xcode-ci-iOS-Swift: xcode-ci-SentrySampleShared
+xcode-ci-iOS-Swift:
 	xcodegen --spec Samples/iOS-Swift/iOS-Swift.yml
 
 .PHONY: xcode-ci-iOS-Swift6
-xcode-ci-iOS-Swift6: xcode-ci-SentrySampleShared
+xcode-ci-iOS-Swift6:
 	xcodegen --spec Samples/iOS-Swift6/iOS-Swift6.yml
 
 .PHONY: xcode-ci-iOS-SwiftUI
-xcode-ci-iOS-SwiftUI: xcode-ci-SentrySampleShared
+xcode-ci-iOS-SwiftUI:
 	xcodegen --spec Samples/iOS-SwiftUI/iOS-SwiftUI.yml
 
 .PHONY: xcode-ci-iOS-SwiftUI-SPM
 xcode-ci-iOS-SwiftUI-SPM:
 	xcodegen --spec Samples/iOS-SwiftUI-SPM/iOS-SwiftUI-SPM.yml
 
 .PHONY: xcode-ci-iOS-SwiftUI-Widgets
-xcode-ci-iOS-SwiftUI-Widgets: xcode-ci-SentrySampleShared
+xcode-ci-iOS-SwiftUI-Widgets:
 	xcodegen --spec Samples/iOS-SwiftUI-Widgets/iOS-SwiftUI-Widgets.yml
 
 .PHONY: xcode-ci-iOS15-SwiftUI
-xcode-ci-iOS15-SwiftUI: xcode-ci-SentrySampleShared
+xcode-ci-iOS15-SwiftUI:
 	xcodegen --spec Samples/iOS15-SwiftUI/iOS15-SwiftUI.yml
 
 .PHONY: xcode-ci-macOS-CLI-Xcode
 xcode-ci-macOS-CLI-Xcode:
 	xcodegen --spec Samples/macOS-CLI-Xcode/macOS-CLI-Xcode.yml
 
 .PHONY: xcode-ci-macOS-Swift
-xcode-ci-macOS-Swift: xcode-ci-SentrySampleShared
+xcode-ci-macOS-Swift:
 	xcodegen --spec Samples/macOS-Swift/macOS-Swift.yml
 
 .PHONY: xcode-ci-macOS-SwiftUI
-xcode-ci-macOS-SwiftUI: xcode-ci-SentrySampleShared
+xcode-ci-macOS-SwiftUI:
 	xcodegen --spec Samples/macOS-SwiftUI/macOS-SwiftUI.yml
 
 .PHONY: xcode-ci-macOS-SwiftUI-SPM
 xcode-ci-macOS-SwiftUI-SPM:
 	xcodegen --spec Samples/macOS-SwiftUI-SPM/macOS-SwiftUI-SPM.yml
 
 .PHONY: xcode-ci-tvOS-Swift
-xcode-ci-tvOS-Swift: xcode-ci-SentrySampleShared
+xcode-ci-tvOS-Swift:
 	xcodegen --spec Samples/tvOS-Swift/tvOS-Swift.yml
 
 .PHONY: xcode-ci-tvOS-SwiftUI-SPM
 xcode-ci-tvOS-SwiftUI-SPM:
 	xcodegen --spec Samples/tvOS-SwiftUI-SPM/tvOS-SwiftUI-SPM.yml
 
 .PHONY: xcode-ci-visionOS-Swift
-xcode-ci-visionOS-Swift: xcode-ci-SentrySampleShared
+xcode-ci-visionOS-Swift:
 	xcodegen --spec Samples/visionOS-Swift/visionOS-Swift.yml
 
 .PHONY: xcode-ci-visionOS-SwiftUI-SPM
 xcode-ci-visionOS-SwiftUI-SPM:
 	xcodegen --spec Samples/visionOS-SwiftUI-SPM/visionOS-SwiftUI-SPM.yml
 
 .PHONY: xcode-ci-watchOS-Swift
-xcode-ci-watchOS-Swift: xcode-ci-SentrySampleShared
+xcode-ci-watchOS-Swift:
 	xcodegen --spec Samples/watchOS-Swift/watchOS-Swift.yml
 
 .PHONY: xcode-ci-DistributionSample

Samples/SDK-Size/App/Sources/App.swift

@@ -1,5 +1,5 @@
 import Foundation
-import Sentry
+import SentrySwift
 import SwiftUI
 
 @main

Samples/SDK-Size/App/Sources/ContentView.swift

@@ -1,4 +1,4 @@
-import Sentry
+import SentrySwift
 import SwiftUI
 
 struct ContentView: View {

Samples/SDK-Size/SDK-Size.yml

@@ -6,9 +6,9 @@ generateEmptyDirectories: true
 configs:
   Debug: debug
   Release: release
-projectReferences:
+packages:
   Sentry:
-    path: ../../Sentry.xcodeproj
+    path: ../..
 options:
   bundleIdPrefix: io.sentry
   defaultSourceDirectoryType: syncedFolder
@@ -38,7 +38,9 @@ targets:
         group: App/Configurations
         buildPhase: none
     dependencies:
-      - target: Sentry/Sentry
+      - package: Sentry
+        products:
+          - SentrySPM
     configFiles:
       Debug: App/Configurations/SDK-Size.xcconfig
       Release: App/Configurations/SDK-Size.xcconfig

Samples/SentrySampleShared/.gitignore

@@ -0,0 +1,8 @@
+.DS_Store
+/.build
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc

Samples/SentrySampleShared/Package.swift

@@ -0,0 +1,44 @@
+// swift-tools-version: 6.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "SentrySampleShared",
+    platforms: [.iOS(.v15), .macOS(.v10_14), .tvOS(.v15), .watchOS(.v8), .visionOS(.v1)],
+    products: [
+        // Products define the executables and libraries a package produces, making them visible to other packages.
+        .library(
+            name: "SentrySampleShared",
+            targets: ["SentrySampleShared"]
+        ),
+        .library(
+            name: "SentrySampleUITestShared",
+            targets: ["SentrySampleUITestShared"]
+        )
+    ],
+    dependencies: [
+        .package(name: "Sentry", path: "../..")
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package, defining a module or a test suite.
+        // Targets can depend on other targets in this package and products from dependencies.
+        .target(
+            name: "SentrySampleShared",
+            dependencies: [
+                .product(name: "SentrySPM", package: "Sentry")
+            ],
+            path: "Sources/SentrySampleShared",
+            resources: [
+                .process("LoremIpsum.txt"),
+                .process("screenshot.png")
+            ]
+        ),
+        .target(
+            name: "SentrySampleUITestShared",
+            path: "Sources/SentrySampleUITestShared",
+            publicHeadersPath: "include"
+        )
+    ],
+    swiftLanguageModes: [.v5]
+)

Samples/SentrySampleShared/SentrySampleShared/AssertView.swift → Samples/SentrySampleShared/Sources/SentrySampleShared/AssertView.swift

@@ -1,7 +1,7 @@
 #if !os(macOS) && !os(watchOS)
 
 import Foundation
-import Sentry
+import SentrySwift
 import UIKit
 
 public class AssertView: UIView {