Skip to content

Commit c3695b4

Browse files
mokagiomokagio
committed
Use xcconfig for WordPressData, same as WordPressAuthenticator
1 parent 444df76 commit c3695b4

File tree

4 files changed

+39
-17
lines changed

4 files changed

+39
-17
lines changed

‎WordPress/WordPress.xcodeproj/project.pbxproj

+12-17
Original file line numberDiff line numberDiff line change
@@ -2140,6 +2140,9 @@
21402140
3FE20C3625CF211F00A15525 /* ListViewData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListViewData.swift; sourceTree = "<group>"; };
21412141
3FE6D31D2B0705D400D14923 /* JetpackBrandingVisibilityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JetpackBrandingVisibilityTests.swift; sourceTree = "<group>"; };
21422142
3FE77C8225B0CA89007DE9E5 /* LocalizableStrings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizableStrings.swift; sourceTree = "<group>"; };
2143+
3FE8B6742D8B898C000A3E7B /* WordPressData.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WordPressData.xcconfig; sourceTree = "<group>"; };
2144+
3FE8B6762D8B89AE000A3E7B /* WordPressData.enterprise.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WordPressData.enterprise.xcconfig; sourceTree = "<group>"; };
2145+
3FE8B6772D8B89C2000A3E7B /* WordPressDataTests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WordPressDataTests.xcconfig; sourceTree = "<group>"; };
21432146
3FF15A55291B4EEA00E1B4E5 /* MigrationCenterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationCenterView.swift; sourceTree = "<group>"; };
21442147
3FF15A5B291ED21100E1B4E5 /* MigrationNotificationsCenterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationNotificationsCenterView.swift; sourceTree = "<group>"; };
21452148
3FF717FE291F07AB00323614 /* MigrationCenterViewConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationCenterViewConfiguration.swift; sourceTree = "<group>"; };
@@ -6526,6 +6529,9 @@
65266529
4AD955572C2155B300D0EEFA /* WordPressAuthenticator.xcconfig */,
65276530
3F9DD3F82CC21E7B00DF1760 /* WordPressAuthenticator.enterprise.xcconfig */,
65286531
4A2F746A2C2198CB00E72117 /* WordPressAuthenticatorTests.xcconfig */,
6532+
3FE8B6742D8B898C000A3E7B /* WordPressData.xcconfig */,
6533+
3FE8B6762D8B89AE000A3E7B /* WordPressData.enterprise.xcconfig */,
6534+
3FE8B6772D8B89C2000A3E7B /* WordPressDataTests.xcconfig */,
65296535
4A98A9032C2274E100A2CE58 /* WordPressKit.xcconfig */,
65306536
4A98A9022C2274E100A2CE58 /* WordPressKitTests.xcconfig */,
65316537
);
@@ -10408,6 +10414,7 @@
1040810414
};
1040910415
3F2AA3F82D81457F002A4E94 /* Debug */ = {
1041010416
isa = XCBuildConfiguration;
10417+
baseConfigurationReference = 3FE8B6742D8B898C000A3E7B /* WordPressData.xcconfig */;
1041110418
buildSettings = {
1041210419
CLANG_ANALYZER_NONNULL = YES;
1041310420
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -10417,17 +10424,14 @@
1041710424
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
1041810425
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
1041910426
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
10420-
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
1042110427
CLANG_WARN_STRICT_PROTOTYPES = YES;
1042210428
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
10423-
CODE_SIGN_STYLE = Manual;
1042410429
COPY_PHASE_STRIP = NO;
1042510430
CURRENT_PROJECT_VERSION = 1;
1042610431
DEFINES_MODULE = YES;
1042710432
DYLIB_COMPATIBILITY_VERSION = 1;
1042810433
DYLIB_CURRENT_VERSION = 1;
1042910434
DYLIB_INSTALL_NAME_BASE = "@rpath";
10430-
ENABLE_USER_SCRIPT_SANDBOXING = YES;
1043110435
GCC_C_LANGUAGE_STANDARD = gnu17;
1043210436
GCC_DYNAMIC_NO_PIC = NO;
1043310437
GCC_OPTIMIZATION_LEVEL = 0;
@@ -10437,7 +10441,6 @@
1043710441
"DEBUG=1",
1043810442
"$(inherited)",
1043910443
);
10440-
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
1044110444
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
1044210445
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
1044310446
GENERATE_INFOPLIST_FILE = YES;
@@ -10456,12 +10459,10 @@
1045610459
MTL_FAST_MATH = YES;
1045710460
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressData;
1045810461
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
10459-
PROVISIONING_PROFILE_SPECIFIER = "";
1046010462
SKIP_INSTALL = YES;
1046110463
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
1046210464
SWIFT_EMIT_LOC_STRINGS = YES;
1046310465
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
10464-
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
1046510466
SWIFT_VERSION = 5.0;
1046610467
TARGETED_DEVICE_FAMILY = "1,2";
1046710468
VERSIONING_SYSTEM = "apple-generic";
@@ -10471,6 +10472,7 @@
1047110472
};
1047210473
3F2AA3F92D81457F002A4E94 /* Release */ = {
1047310474
isa = XCBuildConfiguration;
10475+
baseConfigurationReference = 3FE8B6742D8B898C000A3E7B /* WordPressData.xcconfig */;
1047410476
buildSettings = {
1047510477
CLANG_ANALYZER_NONNULL = YES;
1047610478
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -10480,11 +10482,9 @@
1048010482
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
1048110483
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
1048210484
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
10483-
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
1048410485
CLANG_WARN_STRICT_PROTOTYPES = YES;
1048510486
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
1048610487
CODE_SIGN_IDENTITY = "Apple Distribution: Automattic, Inc. (PZYM8XX95Q)";
10487-
CODE_SIGN_STYLE = Manual;
1048810488
COPY_PHASE_STRIP = NO;
1048910489
CURRENT_PROJECT_VERSION = 1;
1049010490
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -10493,11 +10493,9 @@
1049310493
DYLIB_CURRENT_VERSION = 1;
1049410494
DYLIB_INSTALL_NAME_BASE = "@rpath";
1049510495
ENABLE_NS_ASSERTIONS = NO;
10496-
ENABLE_USER_SCRIPT_SANDBOXING = YES;
1049710496
GCC_C_LANGUAGE_STANDARD = gnu17;
1049810497
GCC_PRECOMPILE_PREFIX_HEADER = YES;
1049910498
GCC_PREFIX_HEADER = WordPressData/WordPressDataPrefix.pch;
10500-
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
1050110499
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
1050210500
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
1050310501
GENERATE_INFOPLIST_FILE = YES;
@@ -10518,7 +10516,6 @@
1051810516
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
1051910517
SKIP_INSTALL = YES;
1052010518
SWIFT_EMIT_LOC_STRINGS = YES;
10521-
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
1052210519
SWIFT_VERSION = 5.0;
1052310520
TARGETED_DEVICE_FAMILY = "1,2";
1052410521
VERSIONING_SYSTEM = "apple-generic";
@@ -10528,6 +10525,7 @@
1052810525
};
1052910526
3F2AA3FA2D81457F002A4E94 /* Release-Alpha */ = {
1053010527
isa = XCBuildConfiguration;
10528+
baseConfigurationReference = 3FE8B6762D8B89AE000A3E7B /* WordPressData.enterprise.xcconfig */;
1053110529
buildSettings = {
1053210530
CLANG_ANALYZER_NONNULL = YES;
1053310531
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -10537,24 +10535,19 @@
1053710535
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
1053810536
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
1053910537
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
10540-
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
1054110538
CLANG_WARN_STRICT_PROTOTYPES = YES;
1054210539
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
1054310540
CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc.";
10544-
CODE_SIGN_STYLE = Manual;
1054510541
COPY_PHASE_STRIP = NO;
1054610542
CURRENT_PROJECT_VERSION = 1;
10547-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1054810543
DEFINES_MODULE = YES;
1054910544
DYLIB_COMPATIBILITY_VERSION = 1;
1055010545
DYLIB_CURRENT_VERSION = 1;
1055110546
DYLIB_INSTALL_NAME_BASE = "@rpath";
1055210547
ENABLE_NS_ASSERTIONS = NO;
10553-
ENABLE_USER_SCRIPT_SANDBOXING = YES;
1055410548
GCC_C_LANGUAGE_STANDARD = gnu17;
1055510549
GCC_PRECOMPILE_PREFIX_HEADER = YES;
1055610550
GCC_PREFIX_HEADER = WordPressData/WordPressDataPrefix.pch;
10557-
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
1055810551
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
1055910552
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
1056010553
GENERATE_INFOPLIST_FILE = YES;
@@ -10575,7 +10568,6 @@
1057510568
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
1057610569
SKIP_INSTALL = YES;
1057710570
SWIFT_EMIT_LOC_STRINGS = YES;
10578-
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
1057910571
SWIFT_VERSION = 5.0;
1058010572
TARGETED_DEVICE_FAMILY = "1,2";
1058110573
VERSIONING_SYSTEM = "apple-generic";
@@ -10585,6 +10577,7 @@
1058510577
};
1058610578
3F2AA3FB2D81457F002A4E94 /* Debug */ = {
1058710579
isa = XCBuildConfiguration;
10580+
baseConfigurationReference = 3FE8B6772D8B89C2000A3E7B /* WordPressDataTests.xcconfig */;
1058810581
buildSettings = {
1058910582
CLANG_ANALYZER_NONNULL = YES;
1059010583
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -10628,6 +10621,7 @@
1062810621
};
1062910622
3F2AA3FC2D81457F002A4E94 /* Release */ = {
1063010623
isa = XCBuildConfiguration;
10624+
baseConfigurationReference = 3FE8B6772D8B89C2000A3E7B /* WordPressDataTests.xcconfig */;
1063110625
buildSettings = {
1063210626
CLANG_ANALYZER_NONNULL = YES;
1063310627
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -10665,6 +10659,7 @@
1066510659
};
1066610660
3F2AA3FD2D81457F002A4E94 /* Release-Alpha */ = {
1066710661
isa = XCBuildConfiguration;
10662+
baseConfigurationReference = 3FE8B6772D8B89C2000A3E7B /* WordPressDataTests.xcconfig */;
1066810663
buildSettings = {
1066910664
CLANG_ANALYZER_NONNULL = YES;
1067010665
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

‎config/WordPressData.enterprise.xcconfig

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#include "WordPressData.xcconfig"
2+
#include "Common.enterprise.xcconfig"
3+
4+
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym

‎config/WordPressData.xcconfig

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#include "Common.xcconfig"
2+
3+
CLANG_ENABLE_MODULES = YES
4+
//CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES_ERROR
5+
SWIFT_INSTALL_OBJC_HEADER = YES
6+
ENABLE_MODULE_VERIFIER = NO
7+
//ENABLE_USER_SCRIPT_SANDBOXING = YES
8+
BUILD_LIBRARY_FOR_DISTRIBUTION = NO
9+
// Unused in this framework - There's no asset catalog
10+
//ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = NO
11+
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO
12+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
13+
GCC_TREAT_WARNINGS_AS_ERRORS = NO

‎config/WordPressDataTests.xcconfig

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#include "Common.xcconfig"
2+
3+
CLANG_ENABLE_MODULES = YES
4+
BUILD_LIBRARY_FOR_DISTRIBUTION = NO
5+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = NO
6+
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO
7+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
8+
GCC_TREAT_WARNINGS_AS_ERRORS = NO
9+
10+
ENABLE_USER_SCRIPT_SANDBOXING = NO

0 commit comments

Comments
 (0)