Skip to content

Commit 41d3c2d

Browse files
philprimephilprime
committed
cleanup
1 parent 33233fc commit 41d3c2d

File tree

8 files changed

+155
-89
lines changed

8 files changed

+155
-89
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
If you need a precompiled XCFramework built with Xcode 15, continue using Sentry SDK 8.x.x.
4040
- Set `SentryException.type` to `nil` when `NSException` has no `reason` (#6653). The backend then can provide a proper message when there is no reason.
4141
- Rename `SentryLog.Level` and `SentryLog.Attribute` for ObjC (#6666)
42-
- App hang tracking is now automatically disabled for Widgets, Live Activities, Intent Extensions, and Action Extensions (#6670).
42+
- App hang tracking is now automatically disabled for Widgets, Live Activities, Action Extensions, (Siri) Intent Extensions, and Share Extensions (#6670).
4343
These components run in separate processes or sandboxes with different execution characteristics, which can cause false positive app hang reports.
4444

4545
### Fixes

‎Samples/iOS-Swift/IntentsUIExtension/Base.lproj/MainInterface.storyboard‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎Samples/iOS-Swift/IntentsUIExtension/Info.plist‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎Samples/iOS-Swift/IntentsUIExtension/IntentViewController.swift‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Benchmarking.xcscheme‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1430"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES"
8+
runPostActionsOnFailure = "NO">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "E7C8F9BC5364F0980E0B827C"
19+
BuildableName = "iOS-Benchmarking.xctest"
20+
BlueprintName = "iOS-Benchmarking"
21+
ReferencedContainer = "container:iOS-Swift.xcodeproj">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
<BuildActionEntry
25+
buildForTesting = "YES"
26+
buildForRunning = "YES"
27+
buildForProfiling = "YES"
28+
buildForArchiving = "YES"
29+
buildForAnalyzing = "YES">
30+
<BuildableReference
31+
BuildableIdentifier = "primary"
32+
BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
33+
BuildableName = "iOS-Swift.app"
34+
BlueprintName = "iOS-Swift"
35+
ReferencedContainer = "container:iOS-Swift.xcodeproj">
36+
</BuildableReference>
37+
</BuildActionEntry>
38+
</BuildActionEntries>
39+
</BuildAction>
40+
<TestAction
41+
buildConfiguration = "Debug"
42+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
43+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
44+
shouldUseLaunchSchemeArgsEnv = "YES"
45+
onlyGenerateCoverageForSpecifiedTargets = "NO">
46+
<TestPlans>
47+
<TestPlanReference
48+
default = "YES"
49+
reference = "container:../../Plans/iOS-Benchmarking_Base.xctestplan">
50+
</TestPlanReference>
51+
</TestPlans>
52+
<MacroExpansion>
53+
<BuildableReference
54+
BuildableIdentifier = "primary"
55+
BlueprintIdentifier = "E7C8F9BC5364F0980E0B827C"
56+
BuildableName = "iOS-Benchmarking.xctest"
57+
BlueprintName = "iOS-Benchmarking"
58+
ReferencedContainer = "container:iOS-Swift.xcodeproj">
59+
</BuildableReference>
60+
</MacroExpansion>
61+
<Testables>
62+
</Testables>
63+
<CommandLineArguments>
64+
</CommandLineArguments>
65+
</TestAction>
66+
<LaunchAction
67+
buildConfiguration = "Debug"
68+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
69+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
70+
launchStyle = "0"
71+
useCustomWorkingDirectory = "NO"
72+
ignoresPersistentStateOnLaunch = "NO"
73+
debugDocumentVersioning = "YES"
74+
debugServiceExtension = "internal"
75+
allowLocationSimulation = "YES">
76+
<MacroExpansion>
77+
<BuildableReference
78+
BuildableIdentifier = "primary"
79+
BlueprintIdentifier = "E7C8F9BC5364F0980E0B827C"
80+
BuildableName = "iOS-Benchmarking.xctest"
81+
BlueprintName = "iOS-Benchmarking"
82+
ReferencedContainer = "container:iOS-Swift.xcodeproj">
83+
</BuildableReference>
84+
</MacroExpansion>
85+
</LaunchAction>
86+
<ProfileAction
87+
buildConfiguration = "Release"
88+
shouldUseLaunchSchemeArgsEnv = "YES"
89+
savedToolIdentifier = ""
90+
useCustomWorkingDirectory = "NO"
91+
debugDocumentVersioning = "YES">
92+
<MacroExpansion>
93+
<BuildableReference
94+
BuildableIdentifier = "primary"
95+
BlueprintIdentifier = "E7C8F9BC5364F0980E0B827C"
96+
BuildableName = "iOS-Benchmarking.xctest"
97+
BlueprintName = "iOS-Benchmarking"
98+
ReferencedContainer = "container:iOS-Swift.xcodeproj">
99+
</BuildableReference>
100+
</MacroExpansion>
101+
</ProfileAction>
102+
<AnalyzeAction
103+
buildConfiguration = "Debug">
104+
</AnalyzeAction>
105+
<ArchiveAction
106+
buildConfiguration = "Release"
107+
revealArchiveInOrganizer = "YES">
108+
</ArchiveAction>
109+
</Scheme>

‎Sources/Sentry/SentryBaseIntegration.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ - (BOOL)shouldBeEnabledWithOptions:(SentryOptions *)options
133133
return NO;
134134
}
135135

136-
// if ((integrationOptions & kIntegrationOptionDebuggerNotAttached) &&
137-
// [SentryDependencyContainer.sharedInstance.crashWrapper isBeingTraced]) {
138-
// [self logWithReason:@"because the debugger is attached"];
139-
// return NO;
140-
// }
136+
if ((integrationOptions & kIntegrationOptionDebuggerNotAttached) &&
137+
[SentryDependencyContainer.sharedInstance.crashWrapper isBeingTraced]) {
138+
[self logWithReason:@"because the debugger is attached"];
139+
return NO;
140+
}
141141

142142
#if SENTRY_HAS_UIKIT
143143
if ((integrationOptions & kIntegrationOptionAttachViewHierarchy)

‎fastlane/Matchfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
git_url("git@github.com:getsentry/codesigning.git")
22
storage_mode("git")
3-
# username("bot@getsentry.com") # Your Apple Developer Portal username
3+
username("bot@getsentry.com") # Your Apple Developer Portal username
44

55
shallow_clone(true)
66
readonly(true)

‎sdk_api.json‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26114,6 +26114,45 @@
2611426114
"declAttributes": [
2611526115
"ObjC"
2611626116
]
26117+
},
26118+
{
26119+
"kind": "Var",
26120+
"name": "share",
26121+
"printedName": "share",
26122+
"children": [
26123+
{
26124+
"kind": "TypeFunc",
26125+
"name": "Function",
26126+
"printedName": "(Sentry.SentryExtensionType.Type) -> Sentry.SentryExtensionType",
26127+
"children": [
26128+
{
26129+
"kind": "TypeNominal",
26130+
"name": "SentryExtensionType",
26131+
"printedName": "Sentry.SentryExtensionType",
26132+
"usr": "c:@M@Sentry@E@SentryExtensionType"
26133+
},
26134+
{
26135+
"kind": "TypeNominal",
26136+
"name": "Metatype",
26137+
"printedName": "Sentry.SentryExtensionType.Type",
26138+
"children": [
26139+
{
26140+
"kind": "TypeNominal",
26141+
"name": "SentryExtensionType",
26142+
"printedName": "Sentry.SentryExtensionType",
26143+
"usr": "c:@M@Sentry@E@SentryExtensionType"
26144+
}
26145+
]
26146+
}
26147+
]
26148+
}
26149+
],
26150+
"declKind": "EnumElement",
26151+
"usr": "c:@M@Sentry@E@SentryExtensionType@SentryExtensionTypeShare",
26152+
"moduleName": "Sentry",
26153+
"declAttributes": [
26154+
"ObjC"
26155+
]
2611726156
}
2611826157
],
2611926158
"declKind": "Enum",

0 commit comments

Comments
 (0)