Skip to content

Commit f9741ae

Browse files
committed
WIP
1 parent f72276c commit f9741ae

File tree

6 files changed

+1665
-44
lines changed

6 files changed

+1665
-44
lines changed

Samples/iOS-Swift/iOS-Swift-Widget/Resources/Info.plist

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,6 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>CFBundleDevelopmentRegion</key>
6-
<string>$(DEVELOPMENT_LANGUAGE)</string>
7-
<key>CFBundleExecutable</key>
8-
<string>$(EXECUTABLE_NAME)</string>
9-
<key>CFBundleIdentifier</key>
10-
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11-
<key>CFBundleInfoDictionaryVersion</key>
12-
<string>6.0</string>
13-
<key>CFBundleName</key>
14-
<string>$(PRODUCT_NAME)</string>
15-
<key>CFBundlePackageType</key>
16-
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
17-
<key>CFBundleShortVersionString</key>
18-
<string>$(MARKETING_VERSION)</string>
19-
<key>CFBundleVersion</key>
20-
<string>$(CURRENT_PROJECT_VERSION)</string>
215
<key>NSExtension</key>
226
<dict>
237
<key>NSExtensionPointIdentifier</key>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ GENERATE_INFOPLIST_FILE = NO
88
SKIP_INSTALL = YES
99
SWIFT_EMIT_LOC_STRINGS = YES
1010

11-
IPHONEOS_DEPLOYMENT_TARGET = 18.0
11+
IPHONEOS_DEPLOYMENT_TARGET = 26.1
1212

1313
CODE_SIGN_STYLE = Automatic
1414

1515
SWIFT_OBJC_BRIDGING_HEADER = iOS-Swift-Widget/Headers/iOS-Swift-Widget-Bridging-Header.h
1616

1717
SUPPORTED_PLATFORMS = iphoneos iphonesimulator
18+
TARGETED_DEVICE_FAMILY = 1,2

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

Lines changed: 131 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@
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>"; };
379378
85850348B69F1BD2BC0102AC /* iOS-SwiftClip.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = "iOS-SwiftClip.app"; sourceTree = BUILT_PRODUCTS_DIR; };
380379
8676CFD056BB0C02B05026F8 /* Architectures.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Architectures.xcconfig; sourceTree = "<group>"; };
381380
884173CDEBFCB5BCA30755D8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
@@ -561,7 +560,6 @@
561560
65C5531F29280E37333FE180 /* iOS-Benchmarking.xcconfig */,
562561
8B24580901EF7733F1B03B44 /* iOS-Swift-ShareExtension.xcconfig */,
563562
BA815EDE87FD977D9551AD8B /* iOS-Swift-UITests.xcconfig */,
564-
84A52EDC2FB34556979DD67D /* iOS-Swift-WidgetExtension.xcconfig */,
565563
5BE4ABE21383962A011E3860 /* iOS-Swift.xcconfig */,
566564
15C104D665E62308894E2A3B /* iOS-SwiftClip.xcconfig */,
567565
);
@@ -955,7 +953,6 @@
955953
ProvisioningStyle = Manual;
956954
};
957955
E486E38BE5537184A3D88E2D = {
958-
DevelopmentTeam = 97JCY7859U;
959956
ProvisioningStyle = Automatic;
960957
};
961958
E7C8F9BC5364F0980E0B827C = {
@@ -1613,9 +1610,39 @@
16131610
};
16141611
5C0272940D41BED18A61967F /* TestCI */ = {
16151612
isa = XCBuildConfiguration;
1616-
baseConfigurationReference = 84A52EDC2FB34556979DD67D /* iOS-Swift-WidgetExtension.xcconfig */;
16171613
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;
16181623
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;
16191646
};
16201647
name = TestCI;
16211648
};
@@ -1740,9 +1767,42 @@
17401767
};
17411768
8D6660C69795418F99391162 /* Release */ = {
17421769
isa = XCBuildConfiguration;
1743-
baseConfigurationReference = 84A52EDC2FB34556979DD67D /* iOS-Swift-WidgetExtension.xcconfig */;
17441770
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;
17451784
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";
17461806
};
17471807
name = Release;
17481808
};
@@ -1757,9 +1817,44 @@
17571817
};
17581818
A68B0F4A133886EF0505F5E3 /* Debug */ = {
17591819
isa = XCBuildConfiguration;
1760-
baseConfigurationReference = 84A52EDC2FB34556979DD67D /* iOS-Swift-WidgetExtension.xcconfig */;
17611820
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;
17621834
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";
17631858
};
17641859
name = Debug;
17651860
};
@@ -1773,9 +1868,38 @@
17731868
};
17741869
C6EF49AF21073D1B84D83276 /* Test */ = {
17751870
isa = XCBuildConfiguration;
1776-
baseConfigurationReference = 84A52EDC2FB34556979DD67D /* iOS-Swift-WidgetExtension.xcconfig */;
17771871
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;
17781881
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";
17791903
};
17801904
name = Test;
17811905
};

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES"
8-
runPostActionsOnFailure = "NO">
7+
buildImplicitDependencies = "YES">
98
<BuildActionEntries>
109
<BuildActionEntry
1110
buildForTesting = "YES"
@@ -27,14 +26,7 @@
2726
buildConfiguration = "Test"
2827
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2928
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
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>
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3830
<MacroExpansion>
3931
<BuildableReference
4032
BuildableIdentifier = "primary"
@@ -44,10 +36,12 @@
4436
ReferencedContainer = "container:iOS-Swift.xcodeproj">
4537
</BuildableReference>
4638
</MacroExpansion>
47-
<Testables>
48-
</Testables>
49-
<CommandLineArguments>
50-
</CommandLineArguments>
39+
<TestPlans>
40+
<TestPlanReference
41+
reference = "container:../../Plans/iOS-Swift_Base.xctestplan"
42+
default = "YES">
43+
</TestPlanReference>
44+
</TestPlans>
5145
</TestAction>
5246
<LaunchAction
5347
buildConfiguration = "Debug"

0 commit comments

Comments
 (0)