Skip to content

Commit 3babc6f

Browse files
armcknightarmcknight
authored
ref: consolidate all sample app configs (#5700)
* ref: consolidate all sample app configs * remove unused duplicate configs * remove another config that got left behind
1 parent fc05805 commit 3babc6f

37 files changed

+55
-793
lines changed

‎Samples/SentrySampleShared/SentrySampleShared.xcconfig‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,4 @@
1-
#include "../Shared/Config/Architectures.xcconfig"
2-
#include "../Shared/Config/BuildOptions.xcconfig"
3-
#include "../Shared/Config/Deployment.xcconfig"
4-
#include "../Shared/Config/Linking.xcconfig"
5-
#include "../Shared/Config/Localization.xcconfig"
6-
#include "../Shared/Config/Packaging.xcconfig"
7-
#include "../Shared/Config/SearchPaths.xcconfig"
8-
#include "../Shared/Config/Signing.xcconfig"
9-
#include "../Shared/Config/Versioning.xcconfig"
10-
#include "../Shared/Config/CodeGeneration.xcconfig"
11-
#include "../Shared/Config/ClangLanguage.xcconfig"
12-
#include "../Shared/Config/ClangCppLanguage.xcconfig"
13-
#include "../Shared/Config/ClangModules.xcconfig"
14-
#include "../Shared/Config/ClangObjCLanguage.xcconfig"
15-
#include "../Shared/Config/ClangPreprocessing.xcconfig"
16-
#include "../Shared/Config/ClangWarnings.xcconfig"
17-
#include "../Shared/Config/ClangWarningsCpp.xcconfig"
18-
#include "../Shared/Config/ClangWarningsObjC.xcconfig"
19-
#include "../Shared/Config/AssetCatalog.xcconfig"
20-
#include "../Shared/Config/ClangAnalyzer.xcconfig"
21-
#include "../Shared/Config/Swift.xcconfig"
22-
#include "../Shared/Config/Metal.xcconfig"
1+
#include "../Shared/Config/_Common.xcconfig"
232

243
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySampleShared
254
INFOPLIST_FILE = SentrySampleShared/Info.plist

‎Samples/SentrySampleShared/SentrySampleUITestShared.xcconfig‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,4 @@
1-
#include "../Shared/Config/Architectures.xcconfig"
2-
#include "../Shared/Config/BuildOptions.xcconfig"
3-
#include "../Shared/Config/Deployment.xcconfig"
4-
#include "../Shared/Config/Linking.xcconfig"
5-
#include "../Shared/Config/Localization.xcconfig"
6-
#include "../Shared/Config/Packaging.xcconfig"
7-
#include "../Shared/Config/SearchPaths.xcconfig"
8-
#include "../Shared/Config/Signing.xcconfig"
9-
#include "../Shared/Config/Versioning.xcconfig"
10-
#include "../Shared/Config/CodeGeneration.xcconfig"
11-
#include "../Shared/Config/ClangLanguage.xcconfig"
12-
#include "../Shared/Config/ClangCppLanguage.xcconfig"
13-
#include "../Shared/Config/ClangModules.xcconfig"
14-
#include "../Shared/Config/ClangObjCLanguage.xcconfig"
15-
#include "../Shared/Config/ClangPreprocessing.xcconfig"
16-
#include "../Shared/Config/ClangWarnings.xcconfig"
17-
#include "../Shared/Config/ClangWarningsCpp.xcconfig"
18-
#include "../Shared/Config/ClangWarningsObjC.xcconfig"
19-
#include "../Shared/Config/AssetCatalog.xcconfig"
20-
#include "../Shared/Config/ClangAnalyzer.xcconfig"
21-
#include "../Shared/Config/Swift.xcconfig"
22-
#include "../Shared/Config/Metal.xcconfig"
1+
#include "../Shared/Config/_Common.xcconfig"
232

243
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySampleUITestShared
254
INFOPLIST_FILE = SentrySampleUITestShared/Info.plist

‎Samples/SessionReplay-CameraTest/SessionReplay-CameraTest.xcconfig‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,4 @@
1-
#include "../Shared/Config/Architectures.xcconfig"
2-
#include "../Shared/Config/BuildOptions.xcconfig"
3-
#include "../Shared/Config/Deployment.xcconfig"
4-
#include "../Shared/Config/Linking.xcconfig"
5-
#include "../Shared/Config/Localization.xcconfig"
6-
#include "../Shared/Config/Packaging.xcconfig"
7-
#include "../Shared/Config/SearchPaths.xcconfig"
8-
#include "../Shared/Config/Signing.xcconfig"
9-
#include "../Shared/Config/Versioning.xcconfig"
10-
#include "../Shared/Config/CodeGeneration.xcconfig"
11-
#include "../Shared/Config/ClangLanguage.xcconfig"
12-
#include "../Shared/Config/ClangCppLanguage.xcconfig"
13-
#include "../Shared/Config/ClangModules.xcconfig"
14-
#include "../Shared/Config/ClangObjCLanguage.xcconfig"
15-
#include "../Shared/Config/ClangPreprocessing.xcconfig"
16-
#include "../Shared/Config/ClangWarnings.xcconfig"
17-
#include "../Shared/Config/ClangWarningsCpp.xcconfig"
18-
#include "../Shared/Config/ClangWarningsObjC.xcconfig"
19-
#include "../Shared/Config/AssetCatalog.xcconfig"
20-
#include "../Shared/Config/ClangAnalyzer.xcconfig"
21-
#include "../Shared/Config/Swift.xcconfig"
22-
#include "../Shared/Config/Metal.xcconfig"
1+
#include "../Shared/Config/_Common.xcconfig"
232

243
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.sample.SessionReplay-CameraTest
254
INFOPLIST_FILE = Sources/Info.plist

‎Samples/Shared/Config/Versioning.xcconfig‎

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

‎Samples/Shared/Config/_Common.xcconfig‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#include "Architectures.xcconfig"
2+
#include "BuildOptions.xcconfig"
3+
#include "Deployment.xcconfig"
4+
#include "Linking.xcconfig"
5+
#include "Localization.xcconfig"
6+
#include "Packaging.xcconfig"
7+
#include "SearchPaths.xcconfig"
8+
#include "Signing.xcconfig"
9+
#include "CodeGeneration.xcconfig"
10+
#include "ClangLanguage.xcconfig"
11+
#include "ClangCppLanguage.xcconfig"
12+
#include "ClangModules.xcconfig"
13+
#include "ClangObjCLanguage.xcconfig"
14+
#include "ClangPreprocessing.xcconfig"
15+
#include "ClangWarnings.xcconfig"
16+
#include "ClangWarningsCpp.xcconfig"
17+
#include "ClangWarningsObjC.xcconfig"
18+
#include "AssetCatalog.xcconfig"
19+
#include "ClangAnalyzer.xcconfig"
20+
#include "Swift.xcconfig"
21+
#include "Metal.xcconfig"
22+
23+
#include "../../Sources/Configuration/Versioning.xcconfig"

‎Samples/iOS-ObjectiveC/iOS-ObjectiveC-UITests.xcconfig‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,4 @@
1-
#include "../Shared/Config/Architectures.xcconfig"
2-
#include "../Shared/Config/BuildOptions.xcconfig"
3-
#include "../Shared/Config/Deployment.xcconfig"
4-
#include "../Shared/Config/Linking.xcconfig"
5-
#include "../Shared/Config/Localization.xcconfig"
6-
#include "../Shared/Config/Packaging.xcconfig"
7-
#include "../Shared/Config/SearchPaths.xcconfig"
8-
#include "../Shared/Config/Signing.xcconfig"
9-
#include "../Shared/Config/Versioning.xcconfig"
10-
#include "../Shared/Config/CodeGeneration.xcconfig"
11-
#include "../Shared/Config/ClangLanguage.xcconfig"
12-
#include "../Shared/Config/ClangCppLanguage.xcconfig"
13-
#include "../Shared/Config/ClangModules.xcconfig"
14-
#include "../Shared/Config/ClangObjCLanguage.xcconfig"
15-
#include "../Shared/Config/ClangPreprocessing.xcconfig"
16-
#include "../Shared/Config/ClangWarnings.xcconfig"
17-
#include "../Shared/Config/ClangWarningsCpp.xcconfig"
18-
#include "../Shared/Config/ClangWarningsObjC.xcconfig"
19-
#include "../Shared/Config/AssetCatalog.xcconfig"
20-
#include "../Shared/Config/ClangAnalyzer.xcconfig"
21-
#include "../Shared/Config/Swift.xcconfig"
22-
#include "../Shared/Config/Metal.xcconfig"
1+
#include "../Shared/Config/_Common.xcconfig"
232

243
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.iOS-ObjectiveC-UITests
254

‎Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcconfig‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,4 @@
1-
#include "../Shared/Config/Architectures.xcconfig"
2-
#include "../Shared/Config/BuildOptions.xcconfig"
3-
#include "../Shared/Config/Deployment.xcconfig"
4-
#include "../Shared/Config/Linking.xcconfig"
5-
#include "../Shared/Config/Localization.xcconfig"
6-
#include "../Shared/Config/Packaging.xcconfig"
7-
#include "../Shared/Config/SearchPaths.xcconfig"
8-
#include "../Shared/Config/Signing.xcconfig"
9-
#include "../Shared/Config/Versioning.xcconfig"
10-
#include "../Shared/Config/CodeGeneration.xcconfig"
11-
#include "../Shared/Config/ClangLanguage.xcconfig"
12-
#include "../Shared/Config/ClangCppLanguage.xcconfig"
13-
#include "../Shared/Config/ClangModules.xcconfig"
14-
#include "../Shared/Config/ClangObjCLanguage.xcconfig"
15-
#include "../Shared/Config/ClangPreprocessing.xcconfig"
16-
#include "../Shared/Config/ClangWarnings.xcconfig"
17-
#include "../Shared/Config/ClangWarningsCpp.xcconfig"
18-
#include "../Shared/Config/ClangWarningsObjC.xcconfig"
19-
#include "../Shared/Config/AssetCatalog.xcconfig"
20-
#include "../Shared/Config/ClangAnalyzer.xcconfig"
21-
#include "../Shared/Config/Swift.xcconfig"
22-
#include "../Shared/Config/Metal.xcconfig"
1+
#include "../Shared/Config/_Common.xcconfig"
232

243
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.iOS-ObjectiveC
254
INFOPLIST_FILE = iOS-ObjectiveC/Info.plist

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

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,4 @@
1-
#include "../Shared/Config/Architectures.xcconfig"
2-
#include "../Shared/Config/BuildOptions.xcconfig"
3-
#include "../Shared/Config/Deployment.xcconfig"
4-
#include "../Shared/Config/Linking.xcconfig"
5-
#include "../Shared/Config/Localization.xcconfig"
6-
#include "../Shared/Config/Packaging.xcconfig"
7-
#include "../Shared/Config/SearchPaths.xcconfig"
8-
#include "../Shared/Config/Signing.xcconfig"
9-
#include "../Shared/Config/Versioning.xcconfig"
10-
#include "../Shared/Config/CodeGeneration.xcconfig"
11-
#include "../Shared/Config/ClangLanguage.xcconfig"
12-
#include "../Shared/Config/ClangCppLanguage.xcconfig"
13-
#include "../Shared/Config/ClangModules.xcconfig"
14-
#include "../Shared/Config/ClangObjCLanguage.xcconfig"
15-
#include "../Shared/Config/ClangPreprocessing.xcconfig"
16-
#include "../Shared/Config/ClangWarnings.xcconfig"
17-
#include "../Shared/Config/ClangWarningsCpp.xcconfig"
18-
#include "../Shared/Config/ClangWarningsObjC.xcconfig"
19-
#include "../Shared/Config/AssetCatalog.xcconfig"
20-
#include "../Shared/Config/ClangAnalyzer.xcconfig"
21-
#include "../Shared/Config/Swift.xcconfig"
22-
#include "../Shared/Config/Metal.xcconfig"
1+
#include "../Shared/Config/_Common.xcconfig"
232

243
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.iOS-Benchmarking
254
INFOPLIST_FILE = iOS-Benchmarking/Info.plist

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

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,4 @@
1-
#include "../Shared/Config/Architectures.xcconfig"
2-
#include "../Shared/Config/BuildOptions.xcconfig"
3-
#include "../Shared/Config/Deployment.xcconfig"
4-
#include "../Shared/Config/Linking.xcconfig"
5-
#include "../Shared/Config/Localization.xcconfig"
6-
#include "../Shared/Config/Packaging.xcconfig"
7-
#include "../Shared/Config/SearchPaths.xcconfig"
8-
#include "../Shared/Config/Signing.xcconfig"
9-
#include "../Shared/Config/Versioning.xcconfig"
10-
#include "../Shared/Config/CodeGeneration.xcconfig"
11-
#include "../Shared/Config/ClangLanguage.xcconfig"
12-
#include "../Shared/Config/ClangCppLanguage.xcconfig"
13-
#include "../Shared/Config/ClangModules.xcconfig"
14-
#include "../Shared/Config/ClangObjCLanguage.xcconfig"
15-
#include "../Shared/Config/ClangPreprocessing.xcconfig"
16-
#include "../Shared/Config/ClangWarnings.xcconfig"
17-
#include "../Shared/Config/ClangWarningsCpp.xcconfig"
18-
#include "../Shared/Config/ClangWarningsObjC.xcconfig"
19-
#include "../Shared/Config/AssetCatalog.xcconfig"
20-
#include "../Shared/Config/ClangAnalyzer.xcconfig"
21-
#include "../Shared/Config/Swift.xcconfig"
22-
#include "../Shared/Config/Metal.xcconfig"
1+
#include "../Shared/Config/_Common.xcconfig"
232

243
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.iOS-Swift-UITests
254

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

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,4 @@
1-
#include "../Shared/Config/Architectures.xcconfig"
2-
#include "../Shared/Config/BuildOptions.xcconfig"
3-
#include "../Shared/Config/Deployment.xcconfig"
4-
#include "../Shared/Config/Linking.xcconfig"
5-
#include "../Shared/Config/Localization.xcconfig"
6-
#include "../Shared/Config/Packaging.xcconfig"
7-
#include "../Shared/Config/SearchPaths.xcconfig"
8-
#include "../Shared/Config/Signing.xcconfig"
9-
#include "../Shared/Config/Versioning.xcconfig"
10-
#include "../Shared/Config/CodeGeneration.xcconfig"
11-
#include "../Shared/Config/ClangLanguage.xcconfig"
12-
#include "../Shared/Config/ClangCppLanguage.xcconfig"
13-
#include "../Shared/Config/ClangModules.xcconfig"
14-
#include "../Shared/Config/ClangObjCLanguage.xcconfig"
15-
#include "../Shared/Config/ClangPreprocessing.xcconfig"
16-
#include "../Shared/Config/ClangWarnings.xcconfig"
17-
#include "../Shared/Config/ClangWarningsCpp.xcconfig"
18-
#include "../Shared/Config/ClangWarningsObjC.xcconfig"
19-
#include "../Shared/Config/AssetCatalog.xcconfig"
20-
#include "../Shared/Config/ClangAnalyzer.xcconfig"
21-
#include "../Shared/Config/Swift.xcconfig"
22-
#include "../Shared/Config/Metal.xcconfig"
1+
#include "../Shared/Config/_Common.xcconfig"
232

243
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.sample.iOS-Swift
254
INFOPLIST_FILE = iOS-Swift/Info.plist

0 commit comments

Comments
 (0)