Merge pull request #1437 from ewanmellor/swift-xcode-project-tidyups

Swift Xcode project tidyups
This commit is contained in:
Terence Parr 2016-12-03 09:11:55 -08:00 committed by GitHub
commit 53b6153060
3 changed files with 13 additions and 9 deletions

View File

@ -904,7 +904,7 @@
F9A421131BCCC35000A9CD35 /* Project object */ = { F9A421131BCCC35000A9CD35 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0800; LastUpgradeCheck = 0810;
ORGANIZATIONNAME = jlabs; ORGANIZATIONNAME = jlabs;
TargetAttributes = { TargetAttributes = {
F9A4211B1BCCC35000A9CD35 = { F9A4211B1BCCC35000A9CD35 = {
@ -1329,8 +1329,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
@ -1377,8 +1379,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
@ -1420,7 +1424,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
OTHER_SWIFT_FLAGS = ""; OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = jlabs.Antlr4; PRODUCT_BUNDLE_IDENTIFIER = org.antlr.v4.swift.macos;
PRODUCT_NAME = "$(PROJECT_NAME)"; PRODUCT_NAME = "$(PROJECT_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_DISABLE_SAFETY_CHECKS = NO; SWIFT_DISABLE_SAFETY_CHECKS = NO;
@ -1446,7 +1450,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
OTHER_SWIFT_FLAGS = ""; OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = jlabs.Antlr4; PRODUCT_BUNDLE_IDENTIFIER = org.antlr.v4.swift.macos;
PRODUCT_NAME = "$(PROJECT_NAME)"; PRODUCT_NAME = "$(PROJECT_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_DISABLE_SAFETY_CHECKS = YES; SWIFT_DISABLE_SAFETY_CHECKS = YES;
@ -1459,7 +1463,7 @@
F9A422FE1BCCD47300A9CD35 /* Debug */ = { F9A422FE1BCCD47300A9CD35 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
@ -1472,7 +1476,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_SWIFT_FLAGS = ""; OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = jlabs.Antlr4; PRODUCT_BUNDLE_IDENTIFIER = org.antlr.v4.swift.ios;
PRODUCT_NAME = "$(PROJECT_NAME)"; PRODUCT_NAME = "$(PROJECT_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
@ -1485,7 +1489,7 @@
F9A422FF1BCCD47300A9CD35 /* Release */ = { F9A422FF1BCCD47300A9CD35 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
@ -1498,7 +1502,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_SWIFT_FLAGS = ""; OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = jlabs.Antlr4; PRODUCT_BUNDLE_IDENTIFIER = org.antlr.v4.swift.ios;
PRODUCT_NAME = "$(PROJECT_NAME)"; PRODUCT_NAME = "$(PROJECT_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0800" LastUpgradeVersion = "0810"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0800" LastUpgradeVersion = "0810"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"