Skip to content

Commit 735a5f7

Browse files
philprimephilprime
committed
cleanup
1 parent 13be451 commit 735a5f7

File tree

5 files changed

+70
-281
lines changed

5 files changed

+70
-281
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
- Removes `SentryIntegrationProtocol` from the API. This is not used after the removal of the `integrations` property (#6660)
2222
- Removes deprecated SentryDebugImageProvider class (#5598)
2323
- Properties on SentryOptions that had no effect on the WithoutUIKit variant are now removed from the API (#6644)
24-
- Removes the SentryOptions.inAppExclude property because it had no effect (#6646)
2524
- Removes segment property on SentryUser, SentryBaggage, and SentryTraceContext (#5638)
2625
- Removes deprecated TraceContext initializers (#6348)
2726
- Removes deprecated user feedback API, this is replaced with the new feedback API (#5591)
@@ -38,9 +37,9 @@
3837
- The precompiled XCFramework is now built with Xcode 16. To submit to the App Store, [Apple now requires Xcode 16](https://developer.apple.com/news/upcoming-requirements/?id=02212025a).
3938
If you need a precompiled XCFramework built with Xcode 15, continue using Sentry SDK 8.x.x.
4039
- Set `SentryException.type` to `nil` when `NSException` has no `reason` (#6653). The backend then can provide a proper message when there is no reason.
41-
- App hang tracking is now automatically disabled for Widgets, Live Activities, Intent Extensions, and Action Extensions (#3901).
42-
These components run in separate processes or sandboxes with different execution characteristics, which can cause false positive app hang reports.
4340
- Rename `SentryLog.Level` and `SentryLog.Attribute` for ObjC (#6666)
41+
- App hang tracking is now automatically disabled for Widgets, Live Activities, Intent Extensions, and Action Extensions (#6670).
42+
These components run in separate processes or sandboxes with different execution characteristics, which can cause false positive app hang reports.
4443

4544
### Features
4645

‎Samples/iOS-Swift/iOS-Swift-WidgetExtension.xcconfig‎

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,54 @@
33
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.sample.iOS-Swift.iOS-Swift-Widget
44
INFOPLIST_FILE = iOS-Swift-Widget/Resources/Info.plist
55

6-
GENERATE_INFOPLIST_FILE = NO
6+
GENERATE_INFOPLIST_FILE = YES
7+
INFOPLIST_KEY_CFBundleDisplayName = iOS-Swift-Widget
8+
INFOPLIST_KEY_NSHumanReadableCopyright =
9+
10+
IPHONEOS_DEPLOYMENT_TARGET = 26.1
11+
TARGETED_DEVICE_FAMILY = 1,2
712

813
SKIP_INSTALL = YES
914
SWIFT_EMIT_LOC_STRINGS = YES
1015

11-
IPHONEOS_DEPLOYMENT_TARGET = 26.1
12-
1316
CODE_SIGN_STYLE = Automatic
1417

1518
SWIFT_OBJC_BRIDGING_HEADER = iOS-Swift-Widget/Headers/iOS-Swift-Widget-Bridging-Header.h
1619

1720
SUPPORTED_PLATFORMS = iphoneos iphonesimulator
18-
TARGETED_DEVICE_FAMILY = 1,2
21+
22+
// Asset Catalog
23+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES
24+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor
25+
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground
26+
27+
// Language Standards
28+
CLANG_CXX_LANGUAGE_STANDARD = gnu++20
29+
GCC_C_LANGUAGE_STANDARD = gnu17
30+
31+
// Swift Settings
32+
SWIFT_VERSION = 5.0
33+
SWIFT_APPROACHABLE_CONCURRENCY = YES
34+
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES
35+
36+
// Localization
37+
LOCALIZATION_PREFERS_STRING_CATALOGS = YES
38+
STRING_CATALOG_GENERATE_SYMBOLS = YES
39+
40+
// Versioning
41+
CURRENT_PROJECT_VERSION = 1
42+
MARKETING_VERSION = 1.0
43+
44+
// Runtime Paths
45+
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
46+
47+
// Debug Configuration
48+
GCC_PREPROCESSOR_DEFINITIONS_Debug = DEBUG=1 $(inherited)
49+
SWIFT_ACTIVE_COMPILATION_CONDITIONS_Debug = DEBUG $(inherited)
50+
PROVISIONING_PROFILE_SPECIFIER_Debug = Xcodegen Release
51+
52+
// Release Configuration
53+
GCC_PREPROCESSOR_DEFINITIONS_Release = DEBUG=1 $(inherited)
54+
55+
// TestCI Configuration
56+
VALIDATE_PRODUCT_TestCI = YES

‎Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@
375375
81DB6A6F98D04EF935889791 /* SampleWidgetBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleWidgetBundle.swift; sourceTree = "<group>"; };
376376
82187F5842E4AF261FF7A79B /* ClangWarnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ClangWarnings.xcconfig; sourceTree = "<group>"; };
377377
84A4BC6BD538C2B4F8E20101 /* ProfilingNetworkScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfilingNetworkScanner.swift; sourceTree = "<group>"; };
378+
84A52EDC2FB34556979DD67D /* iOS-Swift-WidgetExtension.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Swift-WidgetExtension.xcconfig"; sourceTree = "<group>"; };
378379
85850348B69F1BD2BC0102AC /* iOS-SwiftClip.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = "iOS-SwiftClip.app"; sourceTree = BUILT_PRODUCTS_DIR; };
379380
8676CFD056BB0C02B05026F8 /* Architectures.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Architectures.xcconfig; sourceTree = "<group>"; };
380381
884173CDEBFCB5BCA30755D8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
@@ -560,6 +561,7 @@
560561
65C5531F29280E37333FE180 /* iOS-Benchmarking.xcconfig */,
561562
8B24580901EF7733F1B03B44 /* iOS-Swift-ShareExtension.xcconfig */,
562563
BA815EDE87FD977D9551AD8B /* iOS-Swift-UITests.xcconfig */,
564+
84A52EDC2FB34556979DD67D /* iOS-Swift-WidgetExtension.xcconfig */,
563565
5BE4ABE21383962A011E3860 /* iOS-Swift.xcconfig */,
564566
15C104D665E62308894E2A3B /* iOS-SwiftClip.xcconfig */,
565567
);
@@ -953,6 +955,7 @@
953955
ProvisioningStyle = Manual;
954956
};
955957
E486E38BE5537184A3D88E2D = {
958+
DevelopmentTeam = 97JCY7859U;
956959
ProvisioningStyle = Automatic;
957960
};
958961
E7C8F9BC5364F0980E0B827C = {
@@ -1610,39 +1613,9 @@
16101613
};
16111614
5C0272940D41BED18A61967F /* TestCI */ = {
16121615
isa = XCBuildConfiguration;
1616+
baseConfigurationReference = 84A52EDC2FB34556979DD67D /* iOS-Swift-WidgetExtension.xcconfig */;
16131617
buildSettings = {
1614-
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
1615-
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1616-
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
1617-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
1618-
CODE_SIGN_STYLE = Automatic;
1619-
CURRENT_PROJECT_VERSION = 1;
1620-
ENABLE_USER_SCRIPT_SANDBOXING = YES;
1621-
GCC_C_LANGUAGE_STANDARD = gnu17;
1622-
GENERATE_INFOPLIST_FILE = YES;
16231618
INFOPLIST_FILE = "iOS-Swift-Widget/Resources/Info.plist";
1624-
INFOPLIST_KEY_CFBundleDisplayName = "iOS-Swift-Widget";
1625-
INFOPLIST_KEY_NSHumanReadableCopyright = "";
1626-
IPHONEOS_DEPLOYMENT_TARGET = 26.1;
1627-
LD_RUNPATH_SEARCH_PATHS = (
1628-
"$(inherited)",
1629-
"@executable_path/Frameworks",
1630-
"@executable_path/../../Frameworks",
1631-
);
1632-
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1633-
MARKETING_VERSION = 1.0;
1634-
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.iOS-Swift-Widget";
1635-
PRODUCT_NAME = "$(TARGET_NAME)";
1636-
SDKROOT = iphoneos;
1637-
SKIP_INSTALL = YES;
1638-
STRING_CATALOG_GENERATE_SYMBOLS = YES;
1639-
SWIFT_APPROACHABLE_CONCURRENCY = YES;
1640-
SWIFT_EMIT_LOC_STRINGS = YES;
1641-
SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift-Widget/Headers/iOS-Swift-Widget-Bridging-Header.h";
1642-
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
1643-
SWIFT_VERSION = 5.0;
1644-
TARGETED_DEVICE_FAMILY = "1,2";
1645-
VALIDATE_PRODUCT = YES;
16461619
};
16471620
name = TestCI;
16481621
};
@@ -1767,42 +1740,9 @@
17671740
};
17681741
8D6660C69795418F99391162 /* Release */ = {
17691742
isa = XCBuildConfiguration;
1743+
baseConfigurationReference = 84A52EDC2FB34556979DD67D /* iOS-Swift-WidgetExtension.xcconfig */;
17701744
buildSettings = {
1771-
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
1772-
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1773-
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
1774-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
1775-
CODE_SIGN_STYLE = Automatic;
1776-
CURRENT_PROJECT_VERSION = 1;
1777-
ENABLE_USER_SCRIPT_SANDBOXING = YES;
1778-
GCC_C_LANGUAGE_STANDARD = gnu17;
1779-
GCC_PREPROCESSOR_DEFINITIONS = (
1780-
"DEBUG=1",
1781-
"$(inherited)",
1782-
);
1783-
GENERATE_INFOPLIST_FILE = YES;
17841745
INFOPLIST_FILE = "iOS-Swift-Widget/Resources/Info.plist";
1785-
INFOPLIST_KEY_CFBundleDisplayName = "iOS-Swift-Widget";
1786-
INFOPLIST_KEY_NSHumanReadableCopyright = "";
1787-
IPHONEOS_DEPLOYMENT_TARGET = 26.1;
1788-
LD_RUNPATH_SEARCH_PATHS = (
1789-
"$(inherited)",
1790-
"@executable_path/Frameworks",
1791-
"@executable_path/../../Frameworks",
1792-
);
1793-
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1794-
MARKETING_VERSION = 1.0;
1795-
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.iOS-Swift-Widget";
1796-
PRODUCT_NAME = "$(TARGET_NAME)";
1797-
SDKROOT = iphoneos;
1798-
SKIP_INSTALL = YES;
1799-
STRING_CATALOG_GENERATE_SYMBOLS = YES;
1800-
SWIFT_APPROACHABLE_CONCURRENCY = YES;
1801-
SWIFT_EMIT_LOC_STRINGS = YES;
1802-
SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift-Widget/Headers/iOS-Swift-Widget-Bridging-Header.h";
1803-
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
1804-
SWIFT_VERSION = 5.0;
1805-
TARGETED_DEVICE_FAMILY = "1,2";
18061746
};
18071747
name = Release;
18081748
};
@@ -1817,44 +1757,9 @@
18171757
};
18181758
A68B0F4A133886EF0505F5E3 /* Debug */ = {
18191759
isa = XCBuildConfiguration;
1760+
baseConfigurationReference = 84A52EDC2FB34556979DD67D /* iOS-Swift-WidgetExtension.xcconfig */;
18201761
buildSettings = {
1821-
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
1822-
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1823-
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
1824-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
1825-
CODE_SIGN_STYLE = Automatic;
1826-
CURRENT_PROJECT_VERSION = 1;
1827-
ENABLE_USER_SCRIPT_SANDBOXING = YES;
1828-
GCC_C_LANGUAGE_STANDARD = gnu17;
1829-
GCC_PREPROCESSOR_DEFINITIONS = (
1830-
"DEBUG=1",
1831-
"$(inherited)",
1832-
);
1833-
GENERATE_INFOPLIST_FILE = YES;
18341762
INFOPLIST_FILE = "iOS-Swift-Widget/Resources/Info.plist";
1835-
INFOPLIST_KEY_CFBundleDisplayName = "iOS-Swift-Widget";
1836-
INFOPLIST_KEY_NSHumanReadableCopyright = "";
1837-
IPHONEOS_DEPLOYMENT_TARGET = 26.1;
1838-
LD_RUNPATH_SEARCH_PATHS = (
1839-
"$(inherited)",
1840-
"@executable_path/Frameworks",
1841-
"@executable_path/../../Frameworks",
1842-
);
1843-
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1844-
MARKETING_VERSION = 1.0;
1845-
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.iOS-Swift-Widget";
1846-
PRODUCT_NAME = "$(TARGET_NAME)";
1847-
PROVISIONING_PROFILE_SPECIFIER = "Xcodegen Release";
1848-
SDKROOT = iphoneos;
1849-
SKIP_INSTALL = YES;
1850-
STRING_CATALOG_GENERATE_SYMBOLS = YES;
1851-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
1852-
SWIFT_APPROACHABLE_CONCURRENCY = YES;
1853-
SWIFT_EMIT_LOC_STRINGS = YES;
1854-
SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift-Widget/Headers/iOS-Swift-Widget-Bridging-Header.h";
1855-
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
1856-
SWIFT_VERSION = 5.0;
1857-
TARGETED_DEVICE_FAMILY = "1,2";
18581763
};
18591764
name = Debug;
18601765
};
@@ -1868,38 +1773,9 @@
18681773
};
18691774
C6EF49AF21073D1B84D83276 /* Test */ = {
18701775
isa = XCBuildConfiguration;
1776+
baseConfigurationReference = 84A52EDC2FB34556979DD67D /* iOS-Swift-WidgetExtension.xcconfig */;
18711777
buildSettings = {
1872-
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
1873-
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1874-
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
1875-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
1876-
CODE_SIGN_STYLE = Automatic;
1877-
CURRENT_PROJECT_VERSION = 1;
1878-
ENABLE_USER_SCRIPT_SANDBOXING = YES;
1879-
GCC_C_LANGUAGE_STANDARD = gnu17;
1880-
GENERATE_INFOPLIST_FILE = YES;
18811778
INFOPLIST_FILE = "iOS-Swift-Widget/Resources/Info.plist";
1882-
INFOPLIST_KEY_CFBundleDisplayName = "iOS-Swift-Widget";
1883-
INFOPLIST_KEY_NSHumanReadableCopyright = "";
1884-
IPHONEOS_DEPLOYMENT_TARGET = 26.1;
1885-
LD_RUNPATH_SEARCH_PATHS = (
1886-
"$(inherited)",
1887-
"@executable_path/Frameworks",
1888-
"@executable_path/../../Frameworks",
1889-
);
1890-
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1891-
MARKETING_VERSION = 1.0;
1892-
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.iOS-Swift-Widget";
1893-
PRODUCT_NAME = "$(TARGET_NAME)";
1894-
SDKROOT = iphoneos;
1895-
SKIP_INSTALL = YES;
1896-
STRING_CATALOG_GENERATE_SYMBOLS = YES;
1897-
SWIFT_APPROACHABLE_CONCURRENCY = YES;
1898-
SWIFT_EMIT_LOC_STRINGS = YES;
1899-
SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift-Widget/Headers/iOS-Swift-Widget-Bridging-Header.h";
1900-
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
1901-
SWIFT_VERSION = 5.0;
1902-
TARGETED_DEVICE_FAMILY = "1,2";
19031779
};
19041780
name = Test;
19051781
};

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
7+
buildImplicitDependencies = "YES"
8+
runPostActionsOnFailure = "NO">
89
<BuildActionEntries>
910
<BuildActionEntry
1011
buildForTesting = "YES"
@@ -26,7 +27,14 @@
2627
buildConfiguration = "Test"
2728
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2829
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES">
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
onlyGenerateCoverageForSpecifiedTargets = "NO">
32+
<TestPlans>
33+
<TestPlanReference
34+
default = "YES"
35+
reference = "container:../../Plans/iOS-Swift_Base.xctestplan">
36+
</TestPlanReference>
37+
</TestPlans>
3038
<MacroExpansion>
3139
<BuildableReference
3240
BuildableIdentifier = "primary"
@@ -36,12 +44,10 @@
3644
ReferencedContainer = "container:iOS-Swift.xcodeproj">
3745
</BuildableReference>
3846
</MacroExpansion>
39-
<TestPlans>
40-
<TestPlanReference
41-
reference = "container:../../Plans/iOS-Swift_Base.xctestplan"
42-
default = "YES">
43-
</TestPlanReference>
44-
</TestPlans>
47+
<Testables>
48+
</Testables>
49+
<CommandLineArguments>
50+
</CommandLineArguments>
4551
</TestAction>
4652
<LaunchAction
4753
buildConfiguration = "Debug"

0 commit comments

Comments
 (0)