Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: model/architecture reporting for profiling #2205

Merged
merged 53 commits into from
Oct 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
5d62029
DEBUG: experiment with different sysctl call values
armcknight Sep 21, 2022
d9b21cb
fix how arch/model are fetched on macos
armcknight Sep 21, 2022
d06b425
use new functions
armcknight Sep 21, 2022
c07614e
Format code
getsentry-bot Sep 21, 2022
4c6ad86
distinguish x86 32 and 64 bit
armcknight Sep 21, 2022
856c839
move to separate SentryDevice file; fix errno logging and add to more…
armcknight Sep 21, 2022
ecdd578
more updates to cpu arch and add a test
armcknight Sep 22, 2022
4c203f5
Format code
getsentry-bot Sep 22, 2022
e1a4c6d
remove unused macro
armcknight Sep 22, 2022
6645790
refactor architecture checks; fix availability of HW_PRODUCT for maco…
armcknight Sep 22, 2022
f48a065
Format code
getsentry-bot Sep 22, 2022
ab95fd7
run test in iOS-SwiftUITests as well
armcknight Sep 22, 2022
cabcd16
Format code
getsentry-bot Sep 22, 2022
0bdd9d5
prevent nil in profiler payload; assert option for CPU arch on iOS de…
armcknight Sep 22, 2022
3f31f75
add/update comments
armcknight Sep 23, 2022
4651892
update key
armcknight Sep 23, 2022
99f3f23
Format code
getsentry-bot Sep 23, 2022
e4ff1ab
update changelog
armcknight Sep 23, 2022
b9a254b
fix test for macs
armcknight Sep 23, 2022
2a52ff6
refactor test, add to tvOS-SwiftUITests, working for TV simulator
armcknight Sep 23, 2022
c2a5b5a
fixes for all simulator types and mac catalyst
armcknight Sep 23, 2022
2517dd2
comment which checks are which device/os; combine arch checks for iOS…
armcknight Sep 24, 2022
9637173
fix comment
armcknight Sep 27, 2022
590500d
update changelog
armcknight Oct 4, 2022
e625b33
fix tvOS tests to discriminate between tv simulator on m1/intel and r…
armcknight Oct 4, 2022
0748645
Format code
getsentry-bot Oct 4, 2022
76e4134
fix some tv/watch stuff, and simulator device names in CI
armcknight Oct 4, 2022
58028bf
Format code
getsentry-bot Oct 4, 2022
0a07458
fall back to older method if HW_PRODUCT returns empty string
armcknight Oct 4, 2022
2b4a260
logs, comments and fix conditionally-compiled imports/polyfills
armcknight Oct 5, 2022
c04f0da
update how simulators are handled
armcknight Oct 6, 2022
e93406f
add some questions under todos
armcknight Oct 6, 2022
c6d8225
tweak haswell x86 name
armcknight Oct 6, 2022
7043158
fix mac targets in ci; fix failure message
armcknight Oct 6, 2022
97735c0
import watchkit to fix watchOS build breakage
armcknight Oct 6, 2022
07fb5df
Format code
getsentry-bot Oct 6, 2022
464d81f
also check for VMWare for TEST config
armcknight Oct 6, 2022
2ef5878
link watchkit for watch builds
armcknight Oct 6, 2022
18f3a9e
fix capitalization on VMware
armcknight Oct 6, 2022
156d09b
link watchkit in home assistant integration test patch
armcknight Oct 7, 2022
dd4770d
dont report host machine model, only simulated device model
armcknight Oct 7, 2022
6daa671
try linking watchkit just for pod watch targets
armcknight Oct 7, 2022
0811632
fix changelog
armcknight Oct 7, 2022
a490b9f
TEMP: try changing the expected catalyst OS name in test assertion
armcknight Oct 11, 2022
735f61e
hardcode Catalyst OS name
armcknight Oct 11, 2022
9812bcb
reset testing to use debug config by default
armcknight Oct 11, 2022
596468c
remove unused script
armcknight Oct 11, 2022
f225838
prefix global functions with "sentry_"
armcknight Oct 11, 2022
3907847
Format code
getsentry-bot Oct 11, 2022
fa218e4
move header to /include
armcknight Oct 13, 2022
008e1b4
check major versions of reported versions
armcknight Oct 13, 2022
db0d21b
fix osVersion tests
armcknight Oct 13, 2022
5e5fc50
fixup changelog
armcknight Oct 13, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- [Custom measurements API](https://docs.sentry.io/platforms/apple/performance/instrumentation/custom-instrumentation/) (#2268)

### Fixes

- Device info details for profiling (#2205)

## 7.27.1

### Fixes
Expand Down
10 changes: 10 additions & 0 deletions Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
848A256B286E3351008A8858 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; };
848A256D286E3351008A8858 /* fatal-error-binary-images-message2.json in Resources */ = {isa = PBXBuildFile; fileRef = D83A30DF279F1F5C00372D0A /* fatal-error-binary-images-message2.json */; };
848A256F286E3351008A8858 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
84B527B928DD24BA00475E8D /* SentryDeviceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84B527B728DD24BA00475E8D /* SentryDeviceTests.mm */; };
84B527BD28DD25E400475E8D /* SentryDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84B527BC28DD25E400475E8D /* SentryDevice.mm */; };
84BE546F287503F100ACC735 /* SentrySDKPerformanceBenchmarkTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 84BE546E287503F100ACC735 /* SentrySDKPerformanceBenchmarkTests.m */; };
84BE547E287645B900ACC735 /* SentryProcessInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 84BE54792876451D00ACC735 /* SentryProcessInfo.m */; };
84FB8120283EEDB900F3A94A /* PerformanceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84FB811F283EEDB900F3A94A /* PerformanceViewController.swift */; };
Expand Down Expand Up @@ -241,6 +243,9 @@
7BFC8B0526D4D24B000D3504 /* LoremIpsum.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LoremIpsum.txt; sourceTree = "<group>"; };
848A2573286E3351008A8858 /* PerformanceBenchmarks.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PerformanceBenchmarks.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
848A2578286E3490008A8858 /* PerformanceBenchmarks-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PerformanceBenchmarks-Info.plist"; sourceTree = "<group>"; };
84B527B728DD24BA00475E8D /* SentryDeviceTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SentryDeviceTests.mm; path = ../../../Tests/SentryTests/Helper/SentryDeviceTests.mm; sourceTree = "<group>"; };
84B527BB28DD25E400475E8D /* SentryDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryDevice.h; path = ../../../Sources/Sentry/include/SentryDevice.h; sourceTree = "<group>"; };
84B527BC28DD25E400475E8D /* SentryDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SentryDevice.mm; path = ../../../Sources/Sentry/SentryDevice.mm; sourceTree = "<group>"; };
84BE546E287503F100ACC735 /* SentrySDKPerformanceBenchmarkTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySDKPerformanceBenchmarkTests.m; sourceTree = "<group>"; };
84BE54782876451D00ACC735 /* SentryProcessInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SentryProcessInfo.h; sourceTree = "<group>"; };
84BE54792876451D00ACC735 /* SentryProcessInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryProcessInfo.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -411,6 +416,9 @@
D83A30DF279F1F5C00372D0A /* fatal-error-binary-images-message2.json */,
7B64386A26A6C544000D0F65 /* LaunchUITests.swift */,
D83A30E5279FE21F00372D0A /* SentryFileIOTrackingIntegrationTests.swift */,
84B527B728DD24BA00475E8D /* SentryDeviceTests.mm */,
84B527BB28DD25E400475E8D /* SentryDevice.h */,
84B527BC28DD25E400475E8D /* SentryDevice.mm */,
D83A30C7279EFD6E00372D0A /* ClearTestState.swift */,
7B64386C26A6C544000D0F65 /* Info.plist */,
);
Expand Down Expand Up @@ -804,8 +812,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
84B527B928DD24BA00475E8D /* SentryDeviceTests.mm in Sources */,
D83A30E6279FE21F00372D0A /* SentryFileIOTrackingIntegrationTests.swift in Sources */,
7B64386B26A6C544000D0F65 /* LaunchUITests.swift in Sources */,
84B527BD28DD25E400475E8D /* SentryDevice.mm in Sources */,
D83A30C8279EFD6E00372D0A /* ClearTestState.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
10 changes: 10 additions & 0 deletions Samples/tvOS-Swift/tvOS-Swift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
7BA61D6A247FA32600C130A8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7BA61D69247FA32600C130A8 /* Assets.xcassets */; };
7BA61D70247FA32600C130A8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7BA61D6E247FA32600C130A8 /* LaunchScreen.storyboard */; };
7BA61D7A247FA35500C130A8 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7BA61D78247FA35500C130A8 /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8466D4E328DE64F100932CE7 /* SentryDeviceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8466D4E228DE64F100932CE7 /* SentryDeviceTests.mm */; };
8466D4E428DE64F100932CE7 /* SentryDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8466D4E128DE64F000932CE7 /* SentryDevice.mm */; };
84D4FEBF28ECD8A800EDAAFE /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84D4FEBC28ECD8A100EDAAFE /* Sentry.framework */; };
84D4FEC028ECD8AF00EDAAFE /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84D4FEBC28ECD8A100EDAAFE /* Sentry.framework */; };
D822A4232760D15000E7B241 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D822A4222760D15000E7B241 /* AppDelegate.swift */; };
Expand Down Expand Up @@ -98,6 +100,9 @@
7BA61D6F247FA32600C130A8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
7BA61D71247FA32600C130A8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7BA61D78247FA35500C130A8 /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8466D4DF28DE64F000932CE7 /* SentryDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryDevice.h; path = ../../../Sources/Sentry/include/SentryDevice.h; sourceTree = "<group>"; };
8466D4E128DE64F000932CE7 /* SentryDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SentryDevice.mm; path = ../../../Sources/Sentry/SentryDevice.mm; sourceTree = "<group>"; };
8466D4E228DE64F100932CE7 /* SentryDeviceTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SentryDeviceTests.mm; path = ../../../Tests/SentryTests/Helper/SentryDeviceTests.mm; sourceTree = "<group>"; };
84D4FEB628ECD8A100EDAAFE /* Sentry.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sentry.xcodeproj; path = ../../Sentry.xcodeproj; sourceTree = "<group>"; };
D822A4202760D15000E7B241 /* tvOS-SBSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "tvOS-SBSwift.app"; sourceTree = BUILT_PRODUCTS_DIR; };
D822A4222760D15000E7B241 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -152,6 +157,9 @@
7B64388726A6C71A000D0F65 /* tvOS-SwiftUITests */ = {
isa = PBXGroup;
children = (
8466D4E228DE64F100932CE7 /* SentryDeviceTests.mm */,
8466D4DF28DE64F000932CE7 /* SentryDevice.h */,
8466D4E128DE64F000932CE7 /* SentryDevice.mm */,
7B64388826A6C71A000D0F65 /* LaunchUITests.swift */,
7B64388A26A6C71A000D0F65 /* Info.plist */,
);
Expand Down Expand Up @@ -434,6 +442,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8466D4E328DE64F100932CE7 /* SentryDeviceTests.mm in Sources */,
8466D4E428DE64F100932CE7 /* SentryDevice.mm in Sources */,
7B64388926A6C71A000D0F65 /* LaunchUITests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,33 +54,46 @@
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<RemoteRunnable
runnableDebuggingMode = "2"
BundleIdentifier = "com.apple.Carousel"
RemotePath = "/watchOS-Swift WatchKit App">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "7B82C48224C98A93002CA6D1"
BuildableName = "watchOS-Swift WatchKit App.app"
BlueprintName = "watchOS-Swift WatchKit App"
ReferencedContainer = "container:watchOS-Swift.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</RemoteRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<RemoteRunnable
runnableDebuggingMode = "2"
BundleIdentifier = "com.apple.Carousel"
RemotePath = "/watchOS-Swift WatchKit App">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "7B82C48224C98A93002CA6D1"
BuildableName = "watchOS-Swift WatchKit App.app"
BlueprintName = "watchOS-Swift WatchKit App"
ReferencedContainer = "container:watchOS-Swift.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</RemoteRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "7B82C48224C98A93002CA6D1"
BuildableName = "watchOS-Swift WatchKit App.app"
BlueprintName = "watchOS-Swift WatchKit App"
ReferencedContainer = "container:watchOS-Swift.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down
5 changes: 4 additions & 1 deletion Sentry.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ Pod::Spec.new do |s|
'GCC_ENABLE_CPP_EXCEPTIONS' => 'YES',
'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14',
'CLANG_CXX_LIBRARY' => 'libc++'
}
}
s.watchos.pod_target_xcconfig = {
'OTHER_LDFLAGS' => '$(inherited) -framework WatchKit'
}

s.default_subspecs = ['Core']

Expand Down
16 changes: 12 additions & 4 deletions Sentry.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,9 @@
7DC8310C2398283C0043DD9A /* SentryCrashIntegration.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DC831092398283C0043DD9A /* SentryCrashIntegration.m */; };
8453421228BE855D00C22EEC /* SentrySampleDecision.m in Sources */ = {isa = PBXBuildFile; fileRef = 8453421128BE855D00C22EEC /* SentrySampleDecision.m */; };
8453421628BE8A9500C22EEC /* SentrySpanStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 8453421528BE8A9500C22EEC /* SentrySpanStatus.m */; };
84A8891C28DBD28900C51DFD /* SentryDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 84A8891A28DBD28900C51DFD /* SentryDevice.h */; };
84A8891D28DBD28900C51DFD /* SentryDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84A8891B28DBD28900C51DFD /* SentryDevice.mm */; };
84A8892128DBD8D600C51DFD /* SentryDeviceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84A8892028DBD8D600C51DFD /* SentryDeviceTests.mm */; };
861265F92404EC1500C4AFDE /* NSArray+SentrySanitize.h in Headers */ = {isa = PBXBuildFile; fileRef = 861265F72404EC1500C4AFDE /* NSArray+SentrySanitize.h */; };
861265FA2404EC1500C4AFDE /* NSArray+SentrySanitize.m in Sources */ = {isa = PBXBuildFile; fileRef = 861265F82404EC1500C4AFDE /* NSArray+SentrySanitize.m */; };
8E0551E026A7A63C00400526 /* TestProtocolClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E0551DF26A7A63C00400526 /* TestProtocolClient.swift */; };
Expand Down Expand Up @@ -1364,6 +1367,9 @@
844DA81F28246DE300E6B62E /* scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = scripts; sourceTree = "<group>"; };
8453421128BE855D00C22EEC /* SentrySampleDecision.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySampleDecision.m; sourceTree = "<group>"; };
8453421528BE8A9500C22EEC /* SentrySpanStatus.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySpanStatus.m; sourceTree = "<group>"; };
84A8891A28DBD28900C51DFD /* SentryDevice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryDevice.h; path = include/SentryDevice.h; sourceTree = "<group>"; };
84A8891B28DBD28900C51DFD /* SentryDevice.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryDevice.mm; sourceTree = "<group>"; };
84A8892028DBD8D600C51DFD /* SentryDeviceTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryDeviceTests.mm; sourceTree = "<group>"; };
861265F72404EC1500C4AFDE /* NSArray+SentrySanitize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "NSArray+SentrySanitize.h"; path = "include/NSArray+SentrySanitize.h"; sourceTree = "<group>"; };
861265F82404EC1500C4AFDE /* NSArray+SentrySanitize.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSArray+SentrySanitize.m"; sourceTree = "<group>"; };
8E0551DF26A7A63C00400526 /* TestProtocolClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestProtocolClient.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1828,6 +1834,8 @@
7B2A70DC27D6083D008B0D15 /* SentryThreadWrapper.m */,
7B18DE3F28D9F748004845C6 /* SentryNSNotificationCenterWrapper.h */,
7B18DE4128D9F794004845C6 /* SentryNSNotificationCenterWrapper.m */,
84A8891A28DBD28900C51DFD /* SentryDevice.h */,
84A8891B28DBD28900C51DFD /* SentryDevice.mm */,
0A9E917028DC7E7000FB4182 /* SentryInternalDefines.h */,
);
name = Helper;
Expand Down Expand Up @@ -2423,6 +2431,7 @@
7B2A70DE27D60904008B0D15 /* SentryTestThreadWrapper.swift */,
7B18DE4328D9F8F6004845C6 /* TestNSNotificationCenterWrapper.swift */,
7B18DE4928DA0C8B004845C6 /* SentryNSNotificationCenterWrapperTests.swift */,
84A8892028DBD8D600C51DFD /* SentryDeviceTests.mm */,
);
path = Helper;
sourceTree = "<group>";
Expand Down Expand Up @@ -3010,6 +3019,7 @@
7BA235632600B61200E12865 /* SentryInternalNotificationNames.h in Headers */,
7BAF3DB9243C9777008A5414 /* SentryTransport.h in Headers */,
6383953623ABA42C000C1594 /* SentryHttpTransport.h in Headers */,
84A8891C28DBD28900C51DFD /* SentryDevice.h in Headers */,
8E564AEF267AF24400FE117D /* SentryNetworkTracker.h in Headers */,
63FE715120DA4C1100CDBAE8 /* SentryCrashDebug.h in Headers */,
63FE70F520DA4C1000CDBAE8 /* SentryCrashMonitor_System.h in Headers */,
Expand Down Expand Up @@ -3347,6 +3357,7 @@
03F84D3627DD4191008FE43F /* SentryProfilingLogging.mm in Sources */,
8EC3AE7A25CA23B600E7591A /* SentrySpan.m in Sources */,
6360850E1ED2AFE100E8599E /* SentryBreadcrumb.m in Sources */,
84A8891D28DBD28900C51DFD /* SentryDevice.mm in Sources */,
7B56D73324616D9500B842DA /* SentryConcurrentRateLimitsDictionary.m in Sources */,
8ECC674825C23A20000E2BF6 /* SentryTransaction.m in Sources */,
7BECF42826145CD900D9826E /* SentryMechanismMeta.m in Sources */,
Expand Down Expand Up @@ -3517,6 +3528,7 @@
D8FFE50C2703DBB400607131 /* SwizzlingCallTests.swift in Sources */,
D8B76B0828081461000A58C4 /* TestSentryScreenShot.swift in Sources */,
7BE2C7F8257000A4003B66C7 /* SentryTestIntegration.m in Sources */,
84A8892128DBD8D600C51DFD /* SentryDeviceTests.mm in Sources */,
7BC6EBF4255C044A0059822A /* SentryEventTests.swift in Sources */,
63FE721920DA66EC00CDBAE8 /* SentryCrashReportStore_Tests.m in Sources */,
03F9D37C2819A65C00602916 /* SentryProfilerTests.mm in Sources */,
Expand Down Expand Up @@ -3864,7 +3876,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry;
PRODUCT_NAME = Sentry;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -3903,7 +3914,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry;
PRODUCT_NAME = Sentry;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -4070,7 +4080,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry;
PRODUCT_NAME = Sentry;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -4204,7 +4213,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry;
PRODUCT_NAME = Sentry;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
2 changes: 1 addition & 1 deletion Sentry.xcodeproj/xcshareddata/xcschemes/Sentry.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Test"
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "NO"
Expand Down
2 changes: 2 additions & 0 deletions Sources/Configuration/Sentry.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks
LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;

OTHER_LDFLAGS[sdk=watch*] = $(inherited) -framework WatchKit

MODULEMAP_FILE = $(SRCROOT)/Sources/Sentry/Sentry.modulemap
//SWIFT_INCLUDE_PATHS = $(SRCROOT)/Sources/Sentry

Expand Down
Loading