From 54284887e2e64b312e6c6c20e6865cc18b1db4e9 Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Wed, 11 Feb 2026 17:43:53 +0100 Subject: [PATCH 1/4] chore(deps): change SentrySPM to target main branch --- Flinky.xcodeproj/project.pbxproj | 4 +--- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Flinky.xcodeproj/project.pbxproj b/Flinky.xcodeproj/project.pbxproj index a49a52e..0494e5e 100644 --- a/Flinky.xcodeproj/project.pbxproj +++ b/Flinky.xcodeproj/project.pbxproj @@ -19,7 +19,6 @@ 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, ); }; }; @@ -384,7 +383,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D4C71A142F3C8B05006E688D /* SentrySPM in Frameworks */, D4563C912EBA0B4C005B33E2 /* FlinkyCore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1860,7 +1858,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/getsentry/sentry-cocoa"; requirement = { - branch = "philprime/spm-sample"; + branch = main; kind = branch; }; }; diff --git a/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 6c9d061..31c9759 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" + "branch" : "main", + "revision" : "e8cc4e76a3f66e322c2cc2cb39b73b61f4f0c0d8" } }, { From f27287c05a674023806fe552b0a5433f2f469813 Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Wed, 11 Feb 2026 17:50:12 +0100 Subject: [PATCH 2/4] WIP --- Flinky.xcodeproj/project.pbxproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Flinky.xcodeproj/project.pbxproj b/Flinky.xcodeproj/project.pbxproj index 0494e5e..96f92a5 100644 --- a/Flinky.xcodeproj/project.pbxproj +++ b/Flinky.xcodeproj/project.pbxproj @@ -19,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, ); }; }; @@ -383,6 +384,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D4C71A142F3C8B05006E688D /* SentrySPM in Frameworks */, D4563C912EBA0B4C005B33E2 /* FlinkyCore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1858,7 +1860,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/getsentry/sentry-cocoa"; requirement = { - branch = main; + branch = "main"; kind = branch; }; }; From c375b51b6b4e5a211f647a2e55f502cf4df3778a Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Wed, 11 Feb 2026 17:51:03 +0100 Subject: [PATCH 3/4] chore(ci): Enable workflows for all pull requests --- .github/workflows/build-test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 27e630b..8bcd0e5 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -2,8 +2,6 @@ name: Build and Test on: pull_request: - branches: - - main push: branches: - main From 789d9d087663692ab06b0a368b45d34aabcb9acf Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Thu, 12 Feb 2026 11:03:41 +0100 Subject: [PATCH 4/4] refactor: Replace SwiftSPM imports with SentrySwift --- Targets/App/Sources/Main/FlinkyApp.swift | 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 +- .../UI/CreateListEditor/CreateLinkListEditorContainerView.swift | 2 +- Targets/App/Sources/UI/LinkDetail/LinkDetailContainerView.swift | 2 +- Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift | 2 +- .../LinkDetailNFCSharingContainerView.swift | 2 +- .../UI/LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift | 2 +- Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift | 2 +- .../Sources/UI/LinkListDetail/LinkListDetailContainerView.swift | 2 +- .../App/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 +- 19 files changed, 19 insertions(+), 19 deletions(-) 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/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