Xcode: move directives to toplevel project when possible

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj
index ae18c66f942680bf42784808b5abe3300d0e01a0..e0f2447b62e3cb63ced30b6ec85d44f12445a2d1 100644 (file)
--- a/WireGuard/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj
@@ -1273,7 +1273,6 @@
                        buildSettings = {
                                CLANG_ENABLE_MODULES = YES;
                                CODE_SIGN_ENTITLEMENTS = WireGuardNetworkExtension/WireGuardNetworkExtension_iOS.entitlements;
-                               CODE_SIGN_STYLE = Automatic;
                                ENABLE_BITCODE = NO;
                                INFOPLIST_FILE = WireGuardNetworkExtension/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
@@ -1281,8 +1280,6 @@
                                        "@executable_path/Frameworks",
                                        "@executable_path/../../Frameworks",
                                );
-                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-                               MTL_FAST_MATH = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS).network-extension";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
@@ -1296,7 +1293,6 @@
                        buildSettings = {
                                CLANG_ENABLE_MODULES = YES;
                                CODE_SIGN_ENTITLEMENTS = WireGuardNetworkExtension/WireGuardNetworkExtension_iOS.entitlements;
-                               CODE_SIGN_STYLE = Automatic;
                                ENABLE_BITCODE = NO;
                                INFOPLIST_FILE = WireGuardNetworkExtension/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
@@ -1304,7 +1300,6 @@
                                        "@executable_path/Frameworks",
                                        "@executable_path/../../Frameworks",
                                );
-                               MTL_FAST_MATH = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS).network-extension";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
@@ -1316,68 +1311,46 @@
                6FB1BD6821D2607E00A991BF /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
                                CODE_SIGN_ENTITLEMENTS = WireGuard/UI/macOS/WireGuard.entitlements;
                                CODE_SIGN_IDENTITY = "Mac Developer";
-                               CODE_SIGN_STYLE = Automatic;
                                COMBINE_HIDPI_IMAGES = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_OPTIMIZATION_LEVEL = 0;
                                INFOPLIST_FILE = WireGuard/UI/macOS/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
-                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-                               MTL_FAST_MATH = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_MACOS)";
                                PRODUCT_NAME = WireGuard;
                                SDKROOT = macosx;
-                               SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
-                               SWIFT_VERSION = 4.2;
                        };
                        name = Debug;
                };
                6FB1BD6921D2607E00A991BF /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
                                CODE_SIGN_ENTITLEMENTS = WireGuard/UI/macOS/WireGuard.entitlements;
                                CODE_SIGN_IDENTITY = "Mac Developer";
-                               CODE_SIGN_STYLE = Automatic;
                                COMBINE_HIDPI_IMAGES = YES;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                INFOPLIST_FILE = WireGuard/UI/macOS/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
-                               MTL_FAST_MATH = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_MACOS)";
                                PRODUCT_NAME = WireGuard;
                                SDKROOT = macosx;
-                               SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
-                               SWIFT_VERSION = 4.2;
                        };
                        name = Release;
                };
                6FB1BD9A21D4BFE700A991BF /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
                                CODE_SIGN_ENTITLEMENTS = WireGuardNetworkExtension/WireGuardNetworkExtension_macOS.entitlements;
                                CODE_SIGN_IDENTITY = "Mac Developer";
-                               CODE_SIGN_STYLE = Automatic;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_OPTIMIZATION_LEVEL = 0;
                                INFOPLIST_FILE = WireGuardNetworkExtension/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -1385,25 +1358,19 @@
                                        "@executable_path/../../../../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
-                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-                               MTL_FAST_MATH = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_MACOS).network-extension";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SDKROOT = macosx;
                                SKIP_INSTALL = YES;
                                SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
-                               SWIFT_VERSION = 4.2;
                        };
                        name = Debug;
                };
                6FB1BD9B21D4BFE700A991BF /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
                                CODE_SIGN_ENTITLEMENTS = WireGuardNetworkExtension/WireGuardNetworkExtension_macOS.entitlements;
                                CODE_SIGN_IDENTITY = "Mac Developer";
-                               CODE_SIGN_STYLE = Automatic;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                INFOPLIST_FILE = WireGuardNetworkExtension/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -1411,13 +1378,11 @@
                                        "@executable_path/../../../../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
-                               MTL_FAST_MATH = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_MACOS).network-extension";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SDKROOT = macosx;
                                SKIP_INSTALL = YES;
                                SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
-                               SWIFT_VERSION = 4.2;
                        };
                        name = Release;
                };
@@ -1425,12 +1390,6 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                CODE_SIGN_STYLE = Automatic;
-                               DEBUGGING_SYMBOLS = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-                               MTL_FAST_MATH = YES;
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SDKROOT = macosx;
                        };
@@ -1440,9 +1399,6 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                CODE_SIGN_STYLE = Automatic;
-                               MTL_FAST_MATH = YES;
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SDKROOT = macosx;
                        };
@@ -1452,12 +1408,6 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                CODE_SIGN_STYLE = Automatic;
-                               DEBUGGING_SYMBOLS = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-                               MTL_FAST_MATH = YES;
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
@@ -1466,9 +1416,6 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                CODE_SIGN_STYLE = Automatic;
-                               MTL_FAST_MATH = YES;
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -1477,6 +1424,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 6FF4AC2B211EC776002C96EB /* Config.xcconfig */;
                        buildSettings = {
+                               ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1506,7 +1454,6 @@
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_IDENTITY = "iPhone Developer";
                                COPY_PHASE_STRIP = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                ENABLE_TESTABILITY = YES;
@@ -1526,11 +1473,13 @@
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                IPHONEOS_DEPLOYMENT_TARGET = 12.0;
                                MTL_ENABLE_DEBUG_INFO = YES;
+                               MTL_FAST_MATH = YES;
                                ONLY_ACTIVE_ARCH = YES;
                                SDKROOT = iphoneos;
                                SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+                               SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
                                SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-                               SWIFT_VERSION = 4.0;
+                               SWIFT_VERSION = 4.2;
                                TARGETED_DEVICE_FAMILY = "1,2";
                        };
                        name = Debug;
@@ -1539,6 +1488,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 6FF4AC2B211EC776002C96EB /* Config.xcconfig */;
                        buildSettings = {
+                               ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1568,7 +1518,6 @@
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_IDENTITY = "iPhone Developer";
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1584,10 +1533,12 @@
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                IPHONEOS_DEPLOYMENT_TARGET = 12.0;
                                MTL_ENABLE_DEBUG_INFO = NO;
+                               MTL_FAST_MATH = YES;
                                SDKROOT = iphoneos;
                                SWIFT_COMPILATION_MODE = wholemodule;
+                               SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
                                SWIFT_OPTIMIZATION_LEVEL = "-O";
-                               SWIFT_VERSION = 4.0;
+                               SWIFT_VERSION = 4.2;
                                TARGETED_DEVICE_FAMILY = "1,2";
                                VALIDATE_PRODUCT = YES;
                        };
@@ -1596,10 +1547,8 @@
                6FF4AC27211EC472002C96EB /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
                                CODE_SIGN_ENTITLEMENTS = WireGuard/UI/iOS/WireGuard.entitlements;
-                               CODE_SIGN_STYLE = Automatic;
                                INFOPLIST_FILE = WireGuard/UI/iOS/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -1607,18 +1556,14 @@
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS)";
                                PRODUCT_NAME = WireGuard;
-                               SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
-                               SWIFT_VERSION = 4.2;
                        };
                        name = Debug;
                };
                6FF4AC28211EC472002C96EB /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
                                CODE_SIGN_ENTITLEMENTS = WireGuard/UI/iOS/WireGuard.entitlements;
-                               CODE_SIGN_STYLE = Automatic;
                                INFOPLIST_FILE = WireGuard/UI/iOS/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -1626,8 +1571,6 @@
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS)";
                                PRODUCT_NAME = WireGuard;
-                               SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
-                               SWIFT_VERSION = 4.2;
                        };
                        name = Release;
                };