Skip to content

Commit b4e88aa

Browse files
committed
feat(spm): Remove swift imports from objc++
1 parent 409a607 commit b4e88aa

File tree

8 files changed

+108
-94
lines changed

8 files changed

+108
-94
lines changed

Sentry.xcodeproj/project.pbxproj

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@
663663
8431F01B29B2852D00D8DC56 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E4A038225F76A7600000D77 /* Logger.swift */; };
664664
8431F01C29B2854200D8DC56 /* libSentryTestUtils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8431F00A29B284F200D8DC56 /* libSentryTestUtils.a */; };
665665
84354E1129BF944900CDBB8B /* SentryProfileTimeseries.h in Headers */ = {isa = PBXBuildFile; fileRef = 84354E0F29BF944900CDBB8B /* SentryProfileTimeseries.h */; };
666-
84354E1229BF944900CDBB8B /* SentryProfileTimeseries.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84354E1029BF944900CDBB8B /* SentryProfileTimeseries.mm */; };
666+
84354E1229BF944900CDBB8B /* SentryProfileTimeseries.m in Sources */ = {isa = PBXBuildFile; fileRef = 84354E1029BF944900CDBB8B /* SentryProfileTimeseries.m */; };
667667
843FB3232D0CD04D00558F18 /* SentryUserAccess.m in Sources */ = {isa = PBXBuildFile; fileRef = 843FB3222D0CD04D00558F18 /* SentryUserAccess.m */; };
668668
843FB3242D0CD04D00558F18 /* SentryUserAccess.h in Headers */ = {isa = PBXBuildFile; fileRef = 843FB3212D0CD04D00558F18 /* SentryUserAccess.h */; };
669669
843FB3432D156B9900558F18 /* SentryFeedbackTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 843FB3412D156B9900558F18 /* SentryFeedbackTests.swift */; };
@@ -676,9 +676,9 @@
676676
844EDD6C2949387000C86F34 /* SentryMetricProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 844EDD6B2949387000C86F34 /* SentryMetricProfiler.h */; };
677677
8453421228BE855D00C22EEC /* SentrySampleDecision.m in Sources */ = {isa = PBXBuildFile; fileRef = 8453421128BE855D00C22EEC /* SentrySampleDecision.m */; };
678678
8453421628BE8A9500C22EEC /* SentrySpanStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 8453421528BE8A9500C22EEC /* SentrySpanStatus.m */; };
679-
8454CF8D293EAF9A006AC140 /* SentryMetricProfiler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8454CF8B293EAF9A006AC140 /* SentryMetricProfiler.mm */; };
679+
8454CF8D293EAF9A006AC140 /* SentryMetricProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 8454CF8B293EAF9A006AC140 /* SentryMetricProfiler.m */; };
680680
8459FCBE2BD73E820038E9C9 /* SentryProfilerSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 8459FCBD2BD73E810038E9C9 /* SentryProfilerSerialization.h */; };
681-
8459FCC02BD73EB20038E9C9 /* SentryProfilerSerialization.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8459FCBF2BD73EB20038E9C9 /* SentryProfilerSerialization.mm */; };
681+
8459FCC02BD73EB20038E9C9 /* SentryProfilerSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 8459FCBF2BD73EB20038E9C9 /* SentryProfilerSerialization.m */; };
682682
845C16D52A622A5B00EC9519 /* SentryTracer+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 845C16D42A622A5B00EC9519 /* SentryTracer+Private.h */; };
683683
845CEAEF2D83F79500B6B325 /* SentryProfilingPublicAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845CEAEE2D83F79500B6B325 /* SentryProfilingPublicAPITests.swift */; };
684684
845CEB172D8A979700B6B325 /* SentryAppStartProfilingConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845CEB162D8A979700B6B325 /* SentryAppStartProfilingConfigurationTests.swift */; };
@@ -700,7 +700,7 @@
700700
84A5D75B29D5170700388BFA /* TimeInterval+Sentry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A5D75A29D5170700388BFA /* TimeInterval+Sentry.swift */; };
701701
84A7890A2C0E9F6400FF0803 /* SentrySpan+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 84A789092C0E9F5800FF0803 /* SentrySpan+Private.h */; };
702702
84A8891C28DBD28900C51DFD /* SentryDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 84A8891A28DBD28900C51DFD /* SentryDevice.h */; };
703-
84A8891D28DBD28900C51DFD /* SentryDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84A8891B28DBD28900C51DFD /* SentryDevice.mm */; };
703+
84A8891D28DBD28900C51DFD /* SentryDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 84A8891B28DBD28900C51DFD /* SentryDevice.m */; };
704704
84A8892128DBD8D600C51DFD /* SentryDeviceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84A8892028DBD8D600C51DFD /* SentryDeviceTests.mm */; };
705705
84A903712D39F66F00690CE4 /* SentryUserFeedbackFormViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A903702D39F66F00690CE4 /* SentryUserFeedbackFormViewModel.swift */; };
706706
84AC61D229F7541E009EEF61 /* SentryDispatchSourceWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AC61D029F7541E009EEF61 /* SentryDispatchSourceWrapper.h */; };
@@ -1869,7 +1869,7 @@
18691869
8431EFD929B27B1100D8DC56 /* SentryProfilerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SentryProfilerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
18701870
8431F00A29B284F200D8DC56 /* libSentryTestUtils.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSentryTestUtils.a; sourceTree = BUILT_PRODUCTS_DIR; };
18711871
84354E0F29BF944900CDBB8B /* SentryProfileTimeseries.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryProfileTimeseries.h; path = Sources/Sentry/include/SentryProfileTimeseries.h; sourceTree = SOURCE_ROOT; };
1872-
84354E1029BF944900CDBB8B /* SentryProfileTimeseries.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = SentryProfileTimeseries.mm; path = Sources/Sentry/SentryProfileTimeseries.mm; sourceTree = SOURCE_ROOT; };
1872+
84354E1029BF944900CDBB8B /* SentryProfileTimeseries.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SentryProfileTimeseries.m; path = Sources/Sentry/SentryProfileTimeseries.m; sourceTree = SOURCE_ROOT; };
18731873
843BD6282AD8752300B0098F /* .clang-format */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".clang-format"; sourceTree = "<group>"; };
18741874
843FB3212D0CD04D00558F18 /* SentryUserAccess.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryUserAccess.h; path = include/SentryUserAccess.h; sourceTree = "<group>"; };
18751875
843FB3222D0CD04D00558F18 /* SentryUserAccess.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryUserAccess.m; sourceTree = "<group>"; };
@@ -1909,9 +1909,9 @@
19091909
8452E77D2DBC43CF0087020B /* Brewfile-ci-build */ = {isa = PBXFileReference; lastKnownFileType = text; path = "Brewfile-ci-build"; sourceTree = "<group>"; };
19101910
8453421128BE855D00C22EEC /* SentrySampleDecision.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySampleDecision.m; sourceTree = "<group>"; };
19111911
8453421528BE8A9500C22EEC /* SentrySpanStatus.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySpanStatus.m; sourceTree = "<group>"; };
1912-
8454CF8B293EAF9A006AC140 /* SentryMetricProfiler.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = SentryMetricProfiler.mm; path = Sources/Sentry/SentryMetricProfiler.mm; sourceTree = SOURCE_ROOT; };
1912+
8454CF8B293EAF9A006AC140 /* SentryMetricProfiler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SentryMetricProfiler.m; path = Sources/Sentry/SentryMetricProfiler.m; sourceTree = SOURCE_ROOT; };
19131913
8459FCBD2BD73E810038E9C9 /* SentryProfilerSerialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryProfilerSerialization.h; path = Sources/Sentry/include/SentryProfilerSerialization.h; sourceTree = SOURCE_ROOT; };
1914-
8459FCBF2BD73EB20038E9C9 /* SentryProfilerSerialization.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryProfilerSerialization.mm; sourceTree = "<group>"; };
1914+
8459FCBF2BD73EB20038E9C9 /* SentryProfilerSerialization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SentryProfilerSerialization.m; sourceTree = "<group>"; };
19151915
8459FCC12BD73EEF0038E9C9 /* SentryProfilerSerialization+Test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SentryProfilerSerialization+Test.h"; sourceTree = "<group>"; };
19161916
845C16D42A622A5B00EC9519 /* SentryTracer+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryTracer+Private.h"; path = "include/SentryTracer+Private.h"; sourceTree = "<group>"; };
19171917
845CEAEE2D83F79500B6B325 /* SentryProfilingPublicAPITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryProfilingPublicAPITests.swift; sourceTree = "<group>"; };
@@ -1941,7 +1941,7 @@
19411941
84A5D75A29D5170700388BFA /* TimeInterval+Sentry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TimeInterval+Sentry.swift"; sourceTree = "<group>"; };
19421942
84A789092C0E9F5800FF0803 /* SentrySpan+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentrySpan+Private.h"; path = "include/SentrySpan+Private.h"; sourceTree = "<group>"; };
19431943
84A8891A28DBD28900C51DFD /* SentryDevice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryDevice.h; path = include/SentryDevice.h; sourceTree = "<group>"; };
1944-
84A8891B28DBD28900C51DFD /* SentryDevice.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryDevice.mm; sourceTree = "<group>"; };
1944+
84A8891B28DBD28900C51DFD /* SentryDevice.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryDevice.m; sourceTree = "<group>"; };
19451945
84A8892028DBD8D600C51DFD /* SentryDeviceTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryDeviceTests.mm; sourceTree = "<group>"; };
19461946
84A903702D39F66F00690CE4 /* SentryUserFeedbackFormViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryUserFeedbackFormViewModel.swift; sourceTree = "<group>"; };
19471947
84AB6AAF2DB2E9BA006D6C83 /* Versioning.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Versioning.xcconfig; sourceTree = "<group>"; };
@@ -2813,7 +2813,7 @@
28132813
7B18DE3F28D9F748004845C6 /* SentryNSNotificationCenterWrapper.h */,
28142814
7B18DE4128D9F794004845C6 /* SentryNSNotificationCenterWrapper.m */,
28152815
84A8891A28DBD28900C51DFD /* SentryDevice.h */,
2816-
84A8891B28DBD28900C51DFD /* SentryDevice.mm */,
2816+
84A8891B28DBD28900C51DFD /* SentryDevice.m */,
28172817
844EDC6D294143B900C86F34 /* SentryNSProcessInfoWrapper.h */,
28182818
844EDC6E294143B900C86F34 /* SentryNSProcessInfoWrapper.mm */,
28192819
844EDC74294144DB00C86F34 /* SentrySystemWrapper.h */,
@@ -3788,9 +3788,9 @@
37883788
03F84D2C27DD4191008FE43F /* SentryMachLogging.cpp */,
37893789
03F84D1B27DD414C008FE43F /* SentryMachLogging.hpp */,
37903790
844EDD6B2949387000C86F34 /* SentryMetricProfiler.h */,
3791-
8454CF8B293EAF9A006AC140 /* SentryMetricProfiler.mm */,
3791+
8454CF8B293EAF9A006AC140 /* SentryMetricProfiler.m */,
37923792
8459FCBD2BD73E810038E9C9 /* SentryProfilerSerialization.h */,
3793-
8459FCBF2BD73EB20038E9C9 /* SentryProfilerSerialization.mm */,
3793+
8459FCBF2BD73EB20038E9C9 /* SentryProfilerSerialization.m */,
37943794
8459FCC12BD73EEF0038E9C9 /* SentryProfilerSerialization+Test.h */,
37953795
84AF45A429A7FFA500FBB177 /* SentryProfiledTracerConcurrency.h */,
37963796
84AF45A529A7FFA500FBB177 /* SentryProfiledTracerConcurrency.mm */,
@@ -3807,7 +3807,7 @@
38073807
84281C422A578E5600EE88F2 /* SentryProfilerState.mm */,
38083808
84281C642A57D36100EE88F2 /* SentryProfilerState+ObjCpp.h */,
38093809
84354E0F29BF944900CDBB8B /* SentryProfileTimeseries.h */,
3810-
84354E1029BF944900CDBB8B /* SentryProfileTimeseries.mm */,
3810+
84354E1029BF944900CDBB8B /* SentryProfileTimeseries.m */,
38113811
03BCC38D27E2A377003232C7 /* SentryProfilingConditionals.h */,
38123812
84281C442A57905700EE88F2 /* SentrySample.h */,
38133813
84281C452A57905700EE88F2 /* SentrySample.m */,
@@ -5363,7 +5363,7 @@
53635363
7BF9EF782722B35D00B5BBEF /* SentrySubClassFinder.m in Sources */,
53645364
84CFA4CD2C9E0CA3008DA5F4 /* SentryUserFeedbackIntegration.m in Sources */,
53655365
7BCFA71627D0BB50008C662C /* SentryANRTrackerV1.m in Sources */,
5366-
8459FCC02BD73EB20038E9C9 /* SentryProfilerSerialization.mm in Sources */,
5366+
8459FCC02BD73EB20038E9C9 /* SentryProfilerSerialization.m in Sources */,
53675367
63EED6C02237923600E02400 /* SentryOptions.m in Sources */,
53685368
620078722D38F00D0022CB67 /* SentryGeoCodable.swift in Sources */,
53695369
D8CB741B2947286500A5F964 /* SentryEnvelopeItemHeader.m in Sources */,
@@ -5402,7 +5402,7 @@
54025402
33042A0D29DAF79A00C60085 /* SentryExtraContextProvider.m in Sources */,
54035403
7BA61CAD247BAA0B00C130A8 /* SentryDebugImageProvider.m in Sources */,
54045404
63FE70E720DA4C1000CDBAE8 /* SentryCrashMonitor.c in Sources */,
5405-
84354E1229BF944900CDBB8B /* SentryProfileTimeseries.mm in Sources */,
5405+
84354E1229BF944900CDBB8B /* SentryProfileTimeseries.m in Sources */,
54065406
7D5C441C237C2E1F00DAB0A3 /* SentryHub.m in Sources */,
54075407
84E13B842CBF1D91003B52EC /* SentryUserFeedbackWidgetButtonMegaphoneIconView.swift in Sources */,
54085408
63FE715920DA4C1100CDBAE8 /* SentryCrashCPU_x86_32.c in Sources */,
@@ -5441,7 +5441,7 @@
54415441
6360850E1ED2AFE100E8599E /* SentryBreadcrumb.m in Sources */,
54425442
D82859432C3E753C009A28AA /* SentrySessionReplaySyncC.c in Sources */,
54435443
D833D57C2D10784800961E7A /* SentryRRWebOptionsEvent.swift in Sources */,
5444-
84A8891D28DBD28900C51DFD /* SentryDevice.mm in Sources */,
5444+
84A8891D28DBD28900C51DFD /* SentryDevice.m in Sources */,
54455445
7B56D73324616D9500B842DA /* SentryConcurrentRateLimitsDictionary.m in Sources */,
54465446
8ECC674825C23A20000E2BF6 /* SentryTransaction.m in Sources */,
54475447
0A80E433291017C300095219 /* SentryWatchdogTerminationScopeObserver.m in Sources */,
@@ -5572,7 +5572,7 @@
55725572
D88B30A92D48D8C3008DE513 /* SentryMaskingPreviewView.swift in Sources */,
55735573
849B8F992C6E906900148E1F /* SentryUserFeedbackFormConfiguration.swift in Sources */,
55745574
8E8C57A225EEFC07001CEEFA /* SentrySampling.m in Sources */,
5575-
8454CF8D293EAF9A006AC140 /* SentryMetricProfiler.mm in Sources */,
5575+
8454CF8D293EAF9A006AC140 /* SentryMetricProfiler.m in Sources */,
55765576
63FE714120DA4C1100CDBAE8 /* SentryCrashDate.c in Sources */,
55775577
D43B26DA2D70A612007747FD /* SentrySpanDataKey.m in Sources */,
55785578
63FE70DB20DA4C1000CDBAE8 /* SentryCrashMonitor_System.m in Sources */,

Sources/Sentry/Profiling/SentryProfiledTracerConcurrency.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
# import "SentryLogC.h"
88
# import "SentryOptions+Private.h"
99
# import "SentryProfiler+Private.h"
10-
# import "SentrySwift.h"
1110
# include <mutex>
1211

1312
# import "SentryDependencyContainer.h"

0 commit comments

Comments
 (0)