From 5acbd5c923061cb6363e5ca1f59307305585fdf5 Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Wed, 11 Feb 2026 11:04:07 +0100 Subject: [PATCH 1/2] feat: Switch from Sentry xcframework to SentrySPM compile-from-source Migrate all imports from `import Sentry` and `import SentrySwiftUI` to `import SentrySPM`, which compiles Sentry directly from source via SPM. This uses the new SentrySPM product from getsentry/sentry-cocoa that re-exports both the ObjC and Swift modules through a single import. Updated Xcode project references and Package.resolved to point to the philprime/spm-sample branch of sentry-cocoa. --- Flinky.xcodeproj/project.pbxproj | 123 ++++++------------ .../xcshareddata/swiftpm/Package.resolved | 6 +- Targets/App/Sources/Main/FlinkyApp.swift | 2 +- .../Licenses.latest_result.txt | 4 +- .../Resources/Settings.bundle/Licenses.plist | 2 +- .../Sources/Services/AppHealthObserver.swift | 2 +- .../Sources/Services/DataSeedingService.swift | 2 +- .../App/Sources/Services/QRCodeCache.swift | 2 +- .../CreateLinkEditorContainerView.swift | 3 +- ...inkWithListPickerEditorContainerView.swift | 3 +- .../LinkListPickerContainerView.swift | 3 +- .../CreateLinkListEditorContainerView.swift | 3 +- .../LinkDetail/LinkDetailContainerView.swift | 3 +- .../UI/LinkDetail/LinkDetailRenderView.swift | 2 +- .../LinkDetailNFCSharingContainerView.swift | 3 +- .../LinkDetailNFCSharingViewModel.swift | 2 +- .../UI/LinkInfo/LinkInfoContainerView.swift | 3 +- .../LinkListDetailContainerView.swift | 3 +- .../LinkListInfoContainerView.swift | 3 +- .../UI/LinkLists/LinkListsContainerView.swift | 3 +- .../App/Sources/UI/MainContainerView.swift | 2 +- .../Sources/Utils/SentryMetricsHelper.swift | 2 +- .../Sources/ShareViewController.swift | 2 +- 23 files changed, 68 insertions(+), 115 deletions(-) diff --git a/Flinky.xcodeproj/project.pbxproj b/Flinky.xcodeproj/project.pbxproj index f253a62..a49a52e 100644 --- a/Flinky.xcodeproj/project.pbxproj +++ b/Flinky.xcodeproj/project.pbxproj @@ -7,13 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + D410FC5D2F3C8AAB0028B18D /* SentrySPM in Frameworks */ = {isa = PBXBuildFile; productRef = D410FC5C2F3C8AAB0028B18D /* SentrySPM */; }; D44A62A62E33B2800018D789 /* OnLaunch in Frameworks */ = {isa = PBXBuildFile; productRef = D44A62A52E33B2800018D789 /* OnLaunch */; }; D4563C912EBA0B4C005B33E2 /* FlinkyCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A5DC462E46133A00027944 /* FlinkyCore.framework */; }; D462B7812E659CC8006EB4FB /* ShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D4D509DF2E4621120067A402 /* ShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - D48F65922EC7A2630027AFC3 /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = D48F65912EC7A2630027AFC3 /* Sentry */; }; - D48F65942EC7A2770027AFC3 /* SentrySwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = D48F65932EC7A2770027AFC3 /* SentrySwiftUI */; }; - D48F659A2EC7A28A0027AFC3 /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = D48F65992EC7A28A0027AFC3 /* Sentry */; }; - D48F659C2EC7A28A0027AFC3 /* SentrySwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = D48F659B2EC7A28A0027AFC3 /* SentrySwiftUI */; }; D4A016252E83E4EB00117E01 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A016242E83E4EB00117E01 /* SwiftUI.framework */; }; D4A016272E83E8FB00117E01 /* SFSafeSymbols in Frameworks */ = {isa = PBXBuildFile; productRef = D4A016262E83E8FB00117E01 /* SFSafeSymbols */; }; D4A5DC592E46133A00027944 /* FlinkyCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A5DC462E46133A00027944 /* FlinkyCore.framework */; }; @@ -22,6 +19,7 @@ D4A5DD932E46146400027944 /* FlinkyCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A5DC462E46133A00027944 /* FlinkyCore.framework */; }; D4A5DD942E46146400027944 /* FlinkyCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D4A5DC462E46133A00027944 /* FlinkyCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; D4A5DD9B2E46160F00027944 /* SFSafeSymbols in Frameworks */ = {isa = PBXBuildFile; productRef = D4A5DD9A2E46160F00027944 /* SFSafeSymbols */; }; + D4C71A142F3C8B05006E688D /* SentrySPM in Frameworks */ = {isa = PBXBuildFile; productRef = D4C71A132F3C8B05006E688D /* SentrySPM */; }; D4CFD1792E1E38F2001447E9 /* SFSafeSymbols in Frameworks */ = {isa = PBXBuildFile; productRef = D4CFD1782E1E38F2001447E9 /* SFSafeSymbols */; }; D4E7891B2E461A95005DA720 /* FlinkyCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A5DC462E46133A00027944 /* FlinkyCore.framework */; }; D4E7891C2E461A95005DA720 /* FlinkyCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D4A5DC462E46133A00027944 /* FlinkyCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -376,10 +374,9 @@ buildActionMask = 2147483647; files = ( D44A62A62E33B2800018D789 /* OnLaunch in Frameworks */, - D48F65942EC7A2770027AFC3 /* SentrySwiftUI in Frameworks */, D4A5DC592E46133A00027944 /* FlinkyCore.framework in Frameworks */, + D410FC5D2F3C8AAB0028B18D /* SentrySPM in Frameworks */, D4CFD1792E1E38F2001447E9 /* SFSafeSymbols in Frameworks */, - D48F65922EC7A2630027AFC3 /* Sentry in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -387,9 +384,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D4C71A142F3C8B05006E688D /* SentrySPM in Frameworks */, D4563C912EBA0B4C005B33E2 /* FlinkyCore.framework in Frameworks */, - D48F659C2EC7A28A0027AFC3 /* SentrySwiftUI in Frameworks */, - D48F659A2EC7A28A0027AFC3 /* Sentry in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -679,8 +675,7 @@ buildRules = ( ); dependencies = ( - D48F65962EC7A27F0027AFC3 /* PBXTargetDependency */, - D48F65982EC7A27F0027AFC3 /* PBXTargetDependency */, + D4C71A182F3C8B0E006E688D /* PBXTargetDependency */, D4A5DC582E46133A00027944 /* PBXTargetDependency */, D4B4718A2E1F1300005099F3 /* PBXTargetDependency */, D4D509E82E4621120067A402 /* PBXTargetDependency */, @@ -693,8 +688,7 @@ packageProductDependencies = ( D4CFD1782E1E38F2001447E9 /* SFSafeSymbols */, D44A62A52E33B2800018D789 /* OnLaunch */, - D48F65912EC7A2630027AFC3 /* Sentry */, - D48F65932EC7A2770027AFC3 /* SentrySwiftUI */, + D410FC5C2F3C8AAB0028B18D /* SentrySPM */, ); productName = LinkManager; productReference = D4D359D92E1BDF540006226D /* Flinky.app */; @@ -712,17 +706,15 @@ buildRules = ( ); dependencies = ( + D4C71A162F3C8B0A006E688D /* PBXTargetDependency */, D4CD57112ECF2A4900C36BF6 /* PBXTargetDependency */, - D48F659E2EC7A2930027AFC3 /* PBXTargetDependency */, - D48F65A02EC7A2930027AFC3 /* PBXTargetDependency */, ); fileSystemSynchronizedGroups = ( D4D509E02E4621120067A402 /* Sources */, ); name = ShareExtension; packageProductDependencies = ( - D48F65992EC7A28A0027AFC3 /* Sentry */, - D48F659B2EC7A28A0027AFC3 /* SentrySwiftUI */, + D4C71A132F3C8B05006E688D /* SentrySPM */, ); productName = ShareExtension; productReference = D4D509DF2E4621120067A402 /* ShareExtension.appex */; @@ -857,7 +849,7 @@ packageReferences = ( D4CFD1772E1E38F2001447E9 /* XCRemoteSwiftPackageReference "SFSafeSymbols" */, D44A62A42E33B2800018D789 /* XCRemoteSwiftPackageReference "OnLaunch-iOS-Client" */, - D48F65902EC7A2630027AFC3 /* XCRemoteSwiftPackageReference "sentry-cocoa" */, + D410FC5E2F3C8ABD0028B18D /* XCRemoteSwiftPackageReference "sentry-cocoa" */, ); preferredProjectObjectVersion = 77; productRefGroup = D4D359DA2E1BDF540006226D /* Products */; @@ -1107,22 +1099,6 @@ target = D4D509DE2E4621120067A402 /* ShareExtension */; targetProxy = D462B7822E659CC8006EB4FB /* PBXContainerItemProxy */; }; - D48F65962EC7A27F0027AFC3 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - productRef = D48F65952EC7A27F0027AFC3 /* Sentry */; - }; - D48F65982EC7A27F0027AFC3 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - productRef = D48F65972EC7A27F0027AFC3 /* SentrySwiftUI */; - }; - D48F659E2EC7A2930027AFC3 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - productRef = D48F659D2EC7A2930027AFC3 /* Sentry */; - }; - D48F65A02EC7A2930027AFC3 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - productRef = D48F659F2EC7A2930027AFC3 /* SentrySwiftUI */; - }; D4A014D32E83DE2900117E01 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = D4D359D82E1BDF540006226D /* Flinky */; @@ -1160,6 +1136,14 @@ isa = PBXTargetDependency; productRef = D4B471892E1F1300005099F3 /* SFSafeSymbols */; }; + D4C71A162F3C8B0A006E688D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = D4C71A152F3C8B0A006E688D /* SentrySPM */; + }; + D4C71A182F3C8B0E006E688D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = D4C71A172F3C8B0E006E688D /* SentrySPM */; + }; D4CD57112ECF2A4900C36BF6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = D4A5DC452E46133A00027944 /* FlinkyCore */; @@ -1872,20 +1856,20 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - D44A62A42E33B2800018D789 /* XCRemoteSwiftPackageReference "OnLaunch-iOS-Client" */ = { + D410FC5E2F3C8ABD0028B18D /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/kula-app/OnLaunch-iOS-Client"; + repositoryURL = "https://github.com/getsentry/sentry-cocoa"; requirement = { - kind = exactVersion; - version = 0.0.6; + branch = "philprime/spm-sample"; + kind = branch; }; }; - D48F65902EC7A2630027AFC3 /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = { + D44A62A42E33B2800018D789 /* XCRemoteSwiftPackageReference "OnLaunch-iOS-Client" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/getsentry/sentry-cocoa"; + repositoryURL = "https://github.com/kula-app/OnLaunch-iOS-Client"; requirement = { kind = exactVersion; - version = 9.4.0; + version = 0.0.6; }; }; D4CFD1772E1E38F2001447E9 /* XCRemoteSwiftPackageReference "SFSafeSymbols" */ = { @@ -1899,51 +1883,15 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + D410FC5C2F3C8AAB0028B18D /* SentrySPM */ = { + isa = XCSwiftPackageProductDependency; + productName = SentrySPM; + }; D44A62A52E33B2800018D789 /* OnLaunch */ = { isa = XCSwiftPackageProductDependency; package = D44A62A42E33B2800018D789 /* XCRemoteSwiftPackageReference "OnLaunch-iOS-Client" */; productName = OnLaunch; }; - D48F65912EC7A2630027AFC3 /* Sentry */ = { - isa = XCSwiftPackageProductDependency; - package = D48F65902EC7A2630027AFC3 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = Sentry; - }; - D48F65932EC7A2770027AFC3 /* SentrySwiftUI */ = { - isa = XCSwiftPackageProductDependency; - package = D48F65902EC7A2630027AFC3 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = SentrySwiftUI; - }; - D48F65952EC7A27F0027AFC3 /* Sentry */ = { - isa = XCSwiftPackageProductDependency; - package = D48F65902EC7A2630027AFC3 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = Sentry; - }; - D48F65972EC7A27F0027AFC3 /* SentrySwiftUI */ = { - isa = XCSwiftPackageProductDependency; - package = D48F65902EC7A2630027AFC3 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = SentrySwiftUI; - }; - D48F65992EC7A28A0027AFC3 /* Sentry */ = { - isa = XCSwiftPackageProductDependency; - package = D48F65902EC7A2630027AFC3 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = Sentry; - }; - D48F659B2EC7A28A0027AFC3 /* SentrySwiftUI */ = { - isa = XCSwiftPackageProductDependency; - package = D48F65902EC7A2630027AFC3 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = SentrySwiftUI; - }; - D48F659D2EC7A2930027AFC3 /* Sentry */ = { - isa = XCSwiftPackageProductDependency; - package = D48F65902EC7A2630027AFC3 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = Sentry; - }; - D48F659F2EC7A2930027AFC3 /* SentrySwiftUI */ = { - isa = XCSwiftPackageProductDependency; - package = D48F65902EC7A2630027AFC3 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = SentrySwiftUI; - }; D4A016262E83E8FB00117E01 /* SFSafeSymbols */ = { isa = XCSwiftPackageProductDependency; package = D4CFD1772E1E38F2001447E9 /* XCRemoteSwiftPackageReference "SFSafeSymbols" */; @@ -1974,6 +1922,21 @@ package = D4CFD1772E1E38F2001447E9 /* XCRemoteSwiftPackageReference "SFSafeSymbols" */; productName = SFSafeSymbols; }; + D4C71A132F3C8B05006E688D /* SentrySPM */ = { + isa = XCSwiftPackageProductDependency; + package = D410FC5E2F3C8ABD0028B18D /* XCRemoteSwiftPackageReference "sentry-cocoa" */; + productName = SentrySPM; + }; + D4C71A152F3C8B0A006E688D /* SentrySPM */ = { + isa = XCSwiftPackageProductDependency; + package = D410FC5E2F3C8ABD0028B18D /* XCRemoteSwiftPackageReference "sentry-cocoa" */; + productName = SentrySPM; + }; + D4C71A172F3C8B0E006E688D /* SentrySPM */ = { + isa = XCSwiftPackageProductDependency; + package = D410FC5E2F3C8ABD0028B18D /* XCRemoteSwiftPackageReference "sentry-cocoa" */; + productName = SentrySPM; + }; D4CFD1782E1E38F2001447E9 /* SFSafeSymbols */ = { isa = XCSwiftPackageProductDependency; package = D4CFD1772E1E38F2001447E9 /* XCRemoteSwiftPackageReference "SFSafeSymbols" */; diff --git a/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8b3c3cd..6c9d061 100644 --- a/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/getsentry/sentry-cocoa", "state" : { - "revision" : "f1eefffd88cd6dfe5751159a3b32ff3c8e5b3b32", - "version" : "9.4.0" + "branch" : "philprime/spm-sample", + "revision" : "833280e65ad3d142fc555f270c8ea730baa49683" } }, { @@ -24,7 +24,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/SFSafeSymbols/SFSafeSymbols", "state" : { - "revision" : "c6071a5f7bbd83d683c41f08e64d5ab4e248dbe4", + "revision" : "e01b3d4f861412f8dcee8d93c417d2c2b0cdfd77", "version" : "7.0.0" } } diff --git a/Targets/App/Sources/Main/FlinkyApp.swift b/Targets/App/Sources/Main/FlinkyApp.swift index 1b6e62e..f047611 100644 --- a/Targets/App/Sources/Main/FlinkyApp.swift +++ b/Targets/App/Sources/Main/FlinkyApp.swift @@ -1,6 +1,6 @@ import FlinkyCore import OnLaunch -import Sentry +import SentrySPM import SwiftData import SwiftUI import os.log diff --git a/Targets/App/Sources/Resources/Settings.bundle/Licenses.latest_result.txt b/Targets/App/Sources/Resources/Settings.bundle/Licenses.latest_result.txt index 9855260..adfb7ea 100644 --- a/Targets/App/Sources/Resources/Settings.bundle/Licenses.latest_result.txt +++ b/Targets/App/Sources/Resources/Settings.bundle/Licenses.latest_result.txt @@ -1,12 +1,12 @@ name: OnLaunch-iOS-Client, nameSpecified: OnLaunch-iOS-Client, owner: kula-app, version: 0.0.6, source: https://github.com/kula-app/OnLaunch-iOS-Client -name: sentry-cocoa, nameSpecified: Sentry, owner: getsentry, version: 9.4.0, source: https://github.com/getsentry/sentry-cocoa +name: sentry-cocoa, nameSpecified: sentry-cocoa, owner: getsentry, version: , source: https://github.com/getsentry/sentry-cocoa name: SFSafeSymbols, nameSpecified: SFSafeSymbols, owner: SFSafeSymbols, version: 7.0.0, source: https://github.com/SFSafeSymbols/SFSafeSymbols name: OnLaunch-iOS-Client, nameSpecified: OnLaunch-iOS-Client, owner: kula-app, version: 0.0.6, source: https://github.com/kula-app/OnLaunch-iOS-Client -name: sentry-cocoa, nameSpecified: Sentry, owner: getsentry, version: 9.4.0, source: https://github.com/getsentry/sentry-cocoa +name: sentry-cocoa, nameSpecified: sentry-cocoa, owner: getsentry, version: , source: https://github.com/getsentry/sentry-cocoa name: SFSafeSymbols, nameSpecified: SFSafeSymbols, owner: SFSafeSymbols, version: 7.0.0, source: https://github.com/SFSafeSymbols/SFSafeSymbols diff --git a/Targets/App/Sources/Resources/Settings.bundle/Licenses.plist b/Targets/App/Sources/Resources/Settings.bundle/Licenses.plist index a050676..ffdd7ff 100644 --- a/Targets/App/Sources/Resources/Settings.bundle/Licenses.plist +++ b/Targets/App/Sources/Resources/Settings.bundle/Licenses.plist @@ -22,7 +22,7 @@ File Licenses/sentry-cocoa Title - Sentry (9.4.0) + sentry-cocoa Type PSChildPaneSpecifier diff --git a/Targets/App/Sources/Services/AppHealthObserver.swift b/Targets/App/Sources/Services/AppHealthObserver.swift index cb646ef..81726aa 100644 --- a/Targets/App/Sources/Services/AppHealthObserver.swift +++ b/Targets/App/Sources/Services/AppHealthObserver.swift @@ -1,7 +1,7 @@ import Foundation import Network import os.log -import Sentry +import SentrySPM import UIKit /// Observes app health signals and reports them as Sentry metrics. diff --git a/Targets/App/Sources/Services/DataSeedingService.swift b/Targets/App/Sources/Services/DataSeedingService.swift index 65be6d7..35d03f2 100644 --- a/Targets/App/Sources/Services/DataSeedingService.swift +++ b/Targets/App/Sources/Services/DataSeedingService.swift @@ -1,6 +1,6 @@ import FlinkyCore import Foundation -import Sentry +import SentrySPM import SwiftData import os.log diff --git a/Targets/App/Sources/Services/QRCodeCache.swift b/Targets/App/Sources/Services/QRCodeCache.swift index 03deb8e..22d56c2 100644 --- a/Targets/App/Sources/Services/QRCodeCache.swift +++ b/Targets/App/Sources/Services/QRCodeCache.swift @@ -1,6 +1,6 @@ import FlinkyCore import Foundation -import Sentry +import SentrySPM import UIKit import os.log diff --git a/Targets/App/Sources/UI/CreateLinkEditor/CreateLinkEditorContainerView.swift b/Targets/App/Sources/UI/CreateLinkEditor/CreateLinkEditorContainerView.swift index f20626d..c05ddc9 100644 --- a/Targets/App/Sources/UI/CreateLinkEditor/CreateLinkEditorContainerView.swift +++ b/Targets/App/Sources/UI/CreateLinkEditor/CreateLinkEditorContainerView.swift @@ -1,6 +1,5 @@ import FlinkyCore -import Sentry -import SentrySwiftUI +import SentrySPM import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/CreateLinkWithoutListEditor/CreateLinkWithListPickerEditorContainerView.swift b/Targets/App/Sources/UI/CreateLinkWithoutListEditor/CreateLinkWithListPickerEditorContainerView.swift index 85b881c..e232d05 100644 --- a/Targets/App/Sources/UI/CreateLinkWithoutListEditor/CreateLinkWithListPickerEditorContainerView.swift +++ b/Targets/App/Sources/UI/CreateLinkWithoutListEditor/CreateLinkWithListPickerEditorContainerView.swift @@ -1,6 +1,5 @@ import FlinkyCore -import Sentry -import SentrySwiftUI +import SentrySPM import SwiftData import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/CreateLinkWithoutListEditor/LinkListPickerContainerView.swift b/Targets/App/Sources/UI/CreateLinkWithoutListEditor/LinkListPickerContainerView.swift index db53ddc..d31f95c 100644 --- a/Targets/App/Sources/UI/CreateLinkWithoutListEditor/LinkListPickerContainerView.swift +++ b/Targets/App/Sources/UI/CreateLinkWithoutListEditor/LinkListPickerContainerView.swift @@ -1,6 +1,5 @@ import FlinkyCore -import Sentry -import SentrySwiftUI +import SentrySPM import SwiftData import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/CreateListEditor/CreateLinkListEditorContainerView.swift b/Targets/App/Sources/UI/CreateListEditor/CreateLinkListEditorContainerView.swift index f1a2dc2..44388ac 100644 --- a/Targets/App/Sources/UI/CreateListEditor/CreateLinkListEditorContainerView.swift +++ b/Targets/App/Sources/UI/CreateListEditor/CreateLinkListEditorContainerView.swift @@ -1,6 +1,5 @@ import FlinkyCore -import Sentry -import SentrySwiftUI +import SentrySPM import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/LinkDetail/LinkDetailContainerView.swift b/Targets/App/Sources/UI/LinkDetail/LinkDetailContainerView.swift index 3ba7dba..4b58ca3 100644 --- a/Targets/App/Sources/UI/LinkDetail/LinkDetailContainerView.swift +++ b/Targets/App/Sources/UI/LinkDetail/LinkDetailContainerView.swift @@ -1,8 +1,7 @@ import CoreNFC import FlinkyCore import Photos -import Sentry -import SentrySwiftUI +import SentrySPM import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift b/Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift index cb03aa0..fce67ba 100644 --- a/Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift +++ b/Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift @@ -2,7 +2,7 @@ import CoreImage.CIFilterBuiltins import FlinkyCore import Photos import SFSafeSymbols -import Sentry +import SentrySPM import SwiftUI struct LinkDetailRenderView: View { diff --git a/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingContainerView.swift b/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingContainerView.swift index d335793..19eed07 100644 --- a/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingContainerView.swift +++ b/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingContainerView.swift @@ -1,6 +1,5 @@ import FlinkyCore -import Sentry -import SentrySwiftUI +import SentrySPM import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift b/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift index e4ad916..a0ec7d8 100644 --- a/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift +++ b/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift @@ -1,7 +1,7 @@ import CoreNFC import FlinkyCore import Foundation -import Sentry +import SentrySPM final class LinkDetailNFCSharingViewModel: ObservableObject { @Published private(set) var state: NFCSharingState = .ready diff --git a/Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift b/Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift index ac21f0d..8112409 100644 --- a/Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift +++ b/Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift @@ -1,6 +1,5 @@ import FlinkyCore -import Sentry -import SentrySwiftUI +import SentrySPM import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/LinkListDetail/LinkListDetailContainerView.swift b/Targets/App/Sources/UI/LinkListDetail/LinkListDetailContainerView.swift index d3475e2..a8914f0 100644 --- a/Targets/App/Sources/UI/LinkListDetail/LinkListDetailContainerView.swift +++ b/Targets/App/Sources/UI/LinkListDetail/LinkListDetailContainerView.swift @@ -1,6 +1,5 @@ import FlinkyCore -import Sentry -import SentrySwiftUI +import SentrySPM import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/LinkListInfo/LinkListInfoContainerView.swift b/Targets/App/Sources/UI/LinkListInfo/LinkListInfoContainerView.swift index 4badad3..8b9f7b8 100644 --- a/Targets/App/Sources/UI/LinkListInfo/LinkListInfoContainerView.swift +++ b/Targets/App/Sources/UI/LinkListInfo/LinkListInfoContainerView.swift @@ -1,6 +1,5 @@ import FlinkyCore -import Sentry -import SentrySwiftUI +import SentrySPM import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/LinkLists/LinkListsContainerView.swift b/Targets/App/Sources/UI/LinkLists/LinkListsContainerView.swift index 2331ff9..8d3fe9f 100644 --- a/Targets/App/Sources/UI/LinkLists/LinkListsContainerView.swift +++ b/Targets/App/Sources/UI/LinkLists/LinkListsContainerView.swift @@ -1,7 +1,6 @@ import FlinkyCore import SFSafeSymbols -import Sentry -import SentrySwiftUI +import SentrySPM import SwiftData import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/MainContainerView.swift b/Targets/App/Sources/UI/MainContainerView.swift index 56177d2..822555c 100644 --- a/Targets/App/Sources/UI/MainContainerView.swift +++ b/Targets/App/Sources/UI/MainContainerView.swift @@ -1,5 +1,5 @@ import FlinkyCore -import SentrySwiftUI +import SentrySPM import SwiftData import SwiftUI diff --git a/Targets/App/Sources/Utils/SentryMetricsHelper.swift b/Targets/App/Sources/Utils/SentryMetricsHelper.swift index 5272f89..ea24113 100644 --- a/Targets/App/Sources/Utils/SentryMetricsHelper.swift +++ b/Targets/App/Sources/Utils/SentryMetricsHelper.swift @@ -1,7 +1,7 @@ // swiftlint:disable type_body_length file_length import FlinkyCore import Foundation -import Sentry +import SentrySPM // MARK: - SentryMetricsHelper diff --git a/Targets/ShareExtension/Sources/ShareViewController.swift b/Targets/ShareExtension/Sources/ShareViewController.swift index a18e41f..1eca12f 100644 --- a/Targets/ShareExtension/Sources/ShareViewController.swift +++ b/Targets/ShareExtension/Sources/ShareViewController.swift @@ -4,7 +4,7 @@ import UIKit import Social import SwiftData import FlinkyCore -import Sentry +import SentrySPM import os.log import UniformTypeIdentifiers From 99a51a1edd190cf80c243a8dc7a447e459b9a7a5 Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Thu, 12 Feb 2026 11:12:29 +0100 Subject: [PATCH 2/2] replace sentryspm with sentryswift --- Flinky.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- Targets/App/Sources/Main/FlinkyApp.swift | 2 +- .../Resources/Settings.bundle/Licenses.latest_result.txt | 4 ++-- Targets/App/Sources/Resources/Settings.bundle/Licenses.plist | 2 +- Targets/App/Sources/Services/AppHealthObserver.swift | 2 +- Targets/App/Sources/Services/DataSeedingService.swift | 2 +- Targets/App/Sources/Services/QRCodeCache.swift | 2 +- .../UI/CreateLinkEditor/CreateLinkEditorContainerView.swift | 2 +- .../CreateLinkWithListPickerEditorContainerView.swift | 2 +- .../LinkListPickerContainerView.swift | 2 +- .../CreateListEditor/CreateLinkListEditorContainerView.swift | 2 +- .../App/Sources/UI/LinkDetail/LinkDetailContainerView.swift | 2 +- Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift | 2 +- .../LinkDetailNFCSharingContainerView.swift | 2 +- .../LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift | 2 +- Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift | 2 +- .../UI/LinkListDetail/LinkListDetailContainerView.swift | 2 +- .../Sources/UI/LinkListInfo/LinkListInfoContainerView.swift | 2 +- Targets/App/Sources/UI/LinkLists/LinkListsContainerView.swift | 2 +- Targets/App/Sources/UI/MainContainerView.swift | 2 +- Targets/App/Sources/Utils/SentryMetricsHelper.swift | 2 +- Targets/ShareExtension/Sources/ShareViewController.swift | 2 +- 23 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Flinky.xcodeproj/project.pbxproj b/Flinky.xcodeproj/project.pbxproj index a49a52e..77a668b 100644 --- a/Flinky.xcodeproj/project.pbxproj +++ b/Flinky.xcodeproj/project.pbxproj @@ -1860,8 +1860,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/getsentry/sentry-cocoa"; requirement = { - branch = "philprime/spm-sample"; - kind = branch; + kind = exactVersion; + version = 9.4.1; }; }; D44A62A42E33B2800018D789 /* XCRemoteSwiftPackageReference "OnLaunch-iOS-Client" */ = { diff --git a/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 6c9d061..439fff9 100644 --- a/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/getsentry/sentry-cocoa", "state" : { - "branch" : "philprime/spm-sample", - "revision" : "833280e65ad3d142fc555f270c8ea730baa49683" + "revision" : "8a7ae8c0290c83fa0253c5bf8eaf88e49150b6d3", + "version" : "9.4.1" } }, { diff --git a/Targets/App/Sources/Main/FlinkyApp.swift b/Targets/App/Sources/Main/FlinkyApp.swift index f047611..6367860 100644 --- a/Targets/App/Sources/Main/FlinkyApp.swift +++ b/Targets/App/Sources/Main/FlinkyApp.swift @@ -1,6 +1,6 @@ import FlinkyCore import OnLaunch -import SentrySPM +import SentrySwift import SwiftData import SwiftUI import os.log diff --git a/Targets/App/Sources/Resources/Settings.bundle/Licenses.latest_result.txt b/Targets/App/Sources/Resources/Settings.bundle/Licenses.latest_result.txt index adfb7ea..336caf8 100644 --- a/Targets/App/Sources/Resources/Settings.bundle/Licenses.latest_result.txt +++ b/Targets/App/Sources/Resources/Settings.bundle/Licenses.latest_result.txt @@ -1,12 +1,12 @@ name: OnLaunch-iOS-Client, nameSpecified: OnLaunch-iOS-Client, owner: kula-app, version: 0.0.6, source: https://github.com/kula-app/OnLaunch-iOS-Client -name: sentry-cocoa, nameSpecified: sentry-cocoa, owner: getsentry, version: , source: https://github.com/getsentry/sentry-cocoa +name: sentry-cocoa, nameSpecified: Sentry, owner: getsentry, version: 9.4.1, source: https://github.com/getsentry/sentry-cocoa name: SFSafeSymbols, nameSpecified: SFSafeSymbols, owner: SFSafeSymbols, version: 7.0.0, source: https://github.com/SFSafeSymbols/SFSafeSymbols name: OnLaunch-iOS-Client, nameSpecified: OnLaunch-iOS-Client, owner: kula-app, version: 0.0.6, source: https://github.com/kula-app/OnLaunch-iOS-Client -name: sentry-cocoa, nameSpecified: sentry-cocoa, owner: getsentry, version: , source: https://github.com/getsentry/sentry-cocoa +name: sentry-cocoa, nameSpecified: Sentry, owner: getsentry, version: 9.4.1, source: https://github.com/getsentry/sentry-cocoa name: SFSafeSymbols, nameSpecified: SFSafeSymbols, owner: SFSafeSymbols, version: 7.0.0, source: https://github.com/SFSafeSymbols/SFSafeSymbols diff --git a/Targets/App/Sources/Resources/Settings.bundle/Licenses.plist b/Targets/App/Sources/Resources/Settings.bundle/Licenses.plist index ffdd7ff..e7a301f 100644 --- a/Targets/App/Sources/Resources/Settings.bundle/Licenses.plist +++ b/Targets/App/Sources/Resources/Settings.bundle/Licenses.plist @@ -22,7 +22,7 @@ File Licenses/sentry-cocoa Title - sentry-cocoa + Sentry (9.4.1) Type PSChildPaneSpecifier diff --git a/Targets/App/Sources/Services/AppHealthObserver.swift b/Targets/App/Sources/Services/AppHealthObserver.swift index 81726aa..49979e0 100644 --- a/Targets/App/Sources/Services/AppHealthObserver.swift +++ b/Targets/App/Sources/Services/AppHealthObserver.swift @@ -1,7 +1,7 @@ import Foundation import Network import os.log -import SentrySPM +import SentrySwift import UIKit /// Observes app health signals and reports them as Sentry metrics. diff --git a/Targets/App/Sources/Services/DataSeedingService.swift b/Targets/App/Sources/Services/DataSeedingService.swift index 35d03f2..2212cd1 100644 --- a/Targets/App/Sources/Services/DataSeedingService.swift +++ b/Targets/App/Sources/Services/DataSeedingService.swift @@ -1,6 +1,6 @@ import FlinkyCore import Foundation -import SentrySPM +import SentrySwift import SwiftData import os.log diff --git a/Targets/App/Sources/Services/QRCodeCache.swift b/Targets/App/Sources/Services/QRCodeCache.swift index 22d56c2..9a315d2 100644 --- a/Targets/App/Sources/Services/QRCodeCache.swift +++ b/Targets/App/Sources/Services/QRCodeCache.swift @@ -1,6 +1,6 @@ import FlinkyCore import Foundation -import SentrySPM +import SentrySwift import UIKit import os.log diff --git a/Targets/App/Sources/UI/CreateLinkEditor/CreateLinkEditorContainerView.swift b/Targets/App/Sources/UI/CreateLinkEditor/CreateLinkEditorContainerView.swift index c05ddc9..de5214d 100644 --- a/Targets/App/Sources/UI/CreateLinkEditor/CreateLinkEditorContainerView.swift +++ b/Targets/App/Sources/UI/CreateLinkEditor/CreateLinkEditorContainerView.swift @@ -1,5 +1,5 @@ import FlinkyCore -import SentrySPM +import SentrySwift import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/CreateLinkWithoutListEditor/CreateLinkWithListPickerEditorContainerView.swift b/Targets/App/Sources/UI/CreateLinkWithoutListEditor/CreateLinkWithListPickerEditorContainerView.swift index e232d05..467e7ec 100644 --- a/Targets/App/Sources/UI/CreateLinkWithoutListEditor/CreateLinkWithListPickerEditorContainerView.swift +++ b/Targets/App/Sources/UI/CreateLinkWithoutListEditor/CreateLinkWithListPickerEditorContainerView.swift @@ -1,5 +1,5 @@ import FlinkyCore -import SentrySPM +import SentrySwift import SwiftData import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/CreateLinkWithoutListEditor/LinkListPickerContainerView.swift b/Targets/App/Sources/UI/CreateLinkWithoutListEditor/LinkListPickerContainerView.swift index d31f95c..81c6548 100644 --- a/Targets/App/Sources/UI/CreateLinkWithoutListEditor/LinkListPickerContainerView.swift +++ b/Targets/App/Sources/UI/CreateLinkWithoutListEditor/LinkListPickerContainerView.swift @@ -1,5 +1,5 @@ import FlinkyCore -import SentrySPM +import SentrySwift import SwiftData import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/CreateListEditor/CreateLinkListEditorContainerView.swift b/Targets/App/Sources/UI/CreateListEditor/CreateLinkListEditorContainerView.swift index 44388ac..07c5e91 100644 --- a/Targets/App/Sources/UI/CreateListEditor/CreateLinkListEditorContainerView.swift +++ b/Targets/App/Sources/UI/CreateListEditor/CreateLinkListEditorContainerView.swift @@ -1,5 +1,5 @@ import FlinkyCore -import SentrySPM +import SentrySwift import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/LinkDetail/LinkDetailContainerView.swift b/Targets/App/Sources/UI/LinkDetail/LinkDetailContainerView.swift index 4b58ca3..10caf20 100644 --- a/Targets/App/Sources/UI/LinkDetail/LinkDetailContainerView.swift +++ b/Targets/App/Sources/UI/LinkDetail/LinkDetailContainerView.swift @@ -1,7 +1,7 @@ import CoreNFC import FlinkyCore import Photos -import SentrySPM +import SentrySwift import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift b/Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift index fce67ba..99a0ee8 100644 --- a/Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift +++ b/Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift @@ -2,7 +2,7 @@ import CoreImage.CIFilterBuiltins import FlinkyCore import Photos import SFSafeSymbols -import SentrySPM +import SentrySwift import SwiftUI struct LinkDetailRenderView: View { diff --git a/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingContainerView.swift b/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingContainerView.swift index 19eed07..11a8b8a 100644 --- a/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingContainerView.swift +++ b/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingContainerView.swift @@ -1,5 +1,5 @@ import FlinkyCore -import SentrySPM +import SentrySwift import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift b/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift index a0ec7d8..6e72df5 100644 --- a/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift +++ b/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift @@ -1,7 +1,7 @@ import CoreNFC import FlinkyCore import Foundation -import SentrySPM +import SentrySwift final class LinkDetailNFCSharingViewModel: ObservableObject { @Published private(set) var state: NFCSharingState = .ready diff --git a/Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift b/Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift index 8112409..7626246 100644 --- a/Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift +++ b/Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift @@ -1,5 +1,5 @@ import FlinkyCore -import SentrySPM +import SentrySwift import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/LinkListDetail/LinkListDetailContainerView.swift b/Targets/App/Sources/UI/LinkListDetail/LinkListDetailContainerView.swift index a8914f0..198f1b5 100644 --- a/Targets/App/Sources/UI/LinkListDetail/LinkListDetailContainerView.swift +++ b/Targets/App/Sources/UI/LinkListDetail/LinkListDetailContainerView.swift @@ -1,5 +1,5 @@ import FlinkyCore -import SentrySPM +import SentrySwift import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/LinkListInfo/LinkListInfoContainerView.swift b/Targets/App/Sources/UI/LinkListInfo/LinkListInfoContainerView.swift index 8b9f7b8..477524f 100644 --- a/Targets/App/Sources/UI/LinkListInfo/LinkListInfoContainerView.swift +++ b/Targets/App/Sources/UI/LinkListInfo/LinkListInfoContainerView.swift @@ -1,5 +1,5 @@ import FlinkyCore -import SentrySPM +import SentrySwift import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/LinkLists/LinkListsContainerView.swift b/Targets/App/Sources/UI/LinkLists/LinkListsContainerView.swift index 8d3fe9f..aa6e67f 100644 --- a/Targets/App/Sources/UI/LinkLists/LinkListsContainerView.swift +++ b/Targets/App/Sources/UI/LinkLists/LinkListsContainerView.swift @@ -1,6 +1,6 @@ import FlinkyCore import SFSafeSymbols -import SentrySPM +import SentrySwift import SwiftData import SwiftUI import os.log diff --git a/Targets/App/Sources/UI/MainContainerView.swift b/Targets/App/Sources/UI/MainContainerView.swift index 822555c..7bd9229 100644 --- a/Targets/App/Sources/UI/MainContainerView.swift +++ b/Targets/App/Sources/UI/MainContainerView.swift @@ -1,5 +1,5 @@ import FlinkyCore -import SentrySPM +import SentrySwift import SwiftData import SwiftUI diff --git a/Targets/App/Sources/Utils/SentryMetricsHelper.swift b/Targets/App/Sources/Utils/SentryMetricsHelper.swift index ea24113..34fdba4 100644 --- a/Targets/App/Sources/Utils/SentryMetricsHelper.swift +++ b/Targets/App/Sources/Utils/SentryMetricsHelper.swift @@ -1,7 +1,7 @@ // swiftlint:disable type_body_length file_length import FlinkyCore import Foundation -import SentrySPM +import SentrySwift // MARK: - SentryMetricsHelper diff --git a/Targets/ShareExtension/Sources/ShareViewController.swift b/Targets/ShareExtension/Sources/ShareViewController.swift index 1eca12f..95a245f 100644 --- a/Targets/ShareExtension/Sources/ShareViewController.swift +++ b/Targets/ShareExtension/Sources/ShareViewController.swift @@ -4,7 +4,7 @@ import UIKit import Social import SwiftData import FlinkyCore -import SentrySPM +import SentrySwift import os.log import UniformTypeIdentifiers