From eb6495255c76f940fb6ca6083f7ba0d3b2ae7b41 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Fri, 6 Oct 2017 13:21:11 -0400 Subject: Let Xcode 9 update the settings on the projects. --- GTM-Info.plist | 4 +- GTM.xcodeproj/project.pbxproj | 52 +++++++++++++++++++++++++- GTMiPhone-Info.plist | 2 +- GTMiPhone.xcodeproj/project.pbxproj | 46 +++++++++++++++++++++-- UnitTest-Info.plist | 2 +- UnitTesting/GTMUIUnitTestingHarness/Info.plist | 10 ++--- 6 files changed, 103 insertions(+), 13 deletions(-) diff --git a/GTM-Info.plist b/GTM-Info.plist index 41b915d..de31ba4 100644 --- a/GTM-Info.plist +++ b/GTM-Info.plist @@ -1,5 +1,5 @@ - + CFBundleDevelopmentRegion @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.google.GTM + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/GTM.xcodeproj/project.pbxproj b/GTM.xcodeproj/project.pbxproj index 9f7a085..f16f721 100644 --- a/GTM.xcodeproj/project.pbxproj +++ b/GTM.xcodeproj/project.pbxproj @@ -1086,7 +1086,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = NO; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0900; }; buildConfigurationList = 1DEB918108733D990010E9CD /* Build configuration list for PBXProject "GTM" */; compatibilityVersion = "Xcode 3.1"; @@ -1428,10 +1428,30 @@ isa = XCBuildConfiguration; baseConfigurationReference = F4CC9F3F148E5E2500B7D68C /* DebugMacOSX.xcconfig */; buildSettings = { + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_SHADOW = YES; GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter"; GTM_HOST_GCC_PREPROCESSOR_DEFINITIONS = "GTM_USING_XCTEST=1"; MACOSX_DEPLOYMENT_TARGET = 10.6; + ONLY_ACTIVE_ARCH = YES; }; name = Debug; }; @@ -1444,6 +1464,7 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = "GTM-Info.plist"; INSTALL_PATH = "@loader_path/../Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.google.GTM; PRODUCT_NAME = GoogleToolboxForMac; }; name = Debug; @@ -1457,6 +1478,7 @@ "$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)", ); INFOPLIST_FILE = "UnitTest-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.google.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "UnitTest-AddressBook"; }; name = Debug; @@ -1471,6 +1493,7 @@ "$(DEVELOPER_SDK_DIR)/../Library/Frameworks", ); INFOPLIST_FILE = "UnitTest-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.google.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "UnitTest-AppKit"; TEST_HOST = "\"$(BUILT_PRODUCTS_DIR)/GTMUIUnitTestingHarness.app/Contents/MacOS/GTMUIUnitTestingHarness\""; }; @@ -1486,6 +1509,7 @@ ); GTM_NO_DEBUG_FRAMEWORKS = YES; INFOPLIST_FILE = "UnitTest-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.google.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "UnitTest-Foundation"; }; name = Debug; @@ -1499,6 +1523,7 @@ "$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)", ); INFOPLIST_FILE = "UnitTest-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.google.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "UnitTest-UnitTesting"; }; name = Debug; @@ -1514,6 +1539,7 @@ isa = XCBuildConfiguration; buildSettings = { INFOPLIST_FILE = UnitTesting/GTMUIUnitTestingHarness/Info.plist; + PRODUCT_BUNDLE_IDENTIFIER = com.google.GTMUIUnitTestingHarness; PRODUCT_NAME = GTMUIUnitTestingHarness; }; name = Debug; @@ -1522,6 +1548,24 @@ isa = XCBuildConfiguration; baseConfigurationReference = F4CC9F40148E5E2500B7D68C /* ReleaseMacOSX.xcconfig */; buildSettings = { + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_SHADOW = YES; GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter"; GTM_HOST_GCC_PREPROCESSOR_DEFINITIONS = "GTM_USING_XCTEST=1"; @@ -1538,6 +1582,7 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = "GTM-Info.plist"; INSTALL_PATH = "@loader_path/../Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.google.GTM; PRODUCT_NAME = GoogleToolboxForMac; }; name = Release; @@ -1551,6 +1596,7 @@ "$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)", ); INFOPLIST_FILE = "UnitTest-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.google.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "UnitTest-AddressBook"; }; name = Release; @@ -1565,6 +1611,7 @@ "$(DEVELOPER_SDK_DIR)/../Library/Frameworks", ); INFOPLIST_FILE = "UnitTest-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.google.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "UnitTest-AppKit"; TEST_HOST = "\"$(BUILT_PRODUCTS_DIR)/GTMUIUnitTestingHarness.app/Contents/MacOS/GTMUIUnitTestingHarness\""; }; @@ -1580,6 +1627,7 @@ ); GTM_NO_DEBUG_FRAMEWORKS = YES; INFOPLIST_FILE = "UnitTest-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.google.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "UnitTest-Foundation"; }; name = Release; @@ -1593,6 +1641,7 @@ "$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)", ); INFOPLIST_FILE = "UnitTest-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.google.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "UnitTest-UnitTesting"; }; name = Release; @@ -1608,6 +1657,7 @@ isa = XCBuildConfiguration; buildSettings = { INFOPLIST_FILE = UnitTesting/GTMUIUnitTestingHarness/Info.plist; + PRODUCT_BUNDLE_IDENTIFIER = com.google.GTMUIUnitTestingHarness; PRODUCT_NAME = GTMUIUnitTestingHarness; }; name = Release; diff --git a/GTMiPhone-Info.plist b/GTMiPhone-Info.plist index 6898224..ab83993 100644 --- a/GTMiPhone-Info.plist +++ b/GTMiPhone-Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.google.GTMiPhone + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/GTMiPhone.xcodeproj/project.pbxproj b/GTMiPhone.xcodeproj/project.pbxproj index 529e64f..ac9bd50 100644 --- a/GTMiPhone.xcodeproj/project.pbxproj +++ b/GTMiPhone.xcodeproj/project.pbxproj @@ -590,7 +590,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0460; + LastUpgradeCheck = 0900; TargetAttributes = { 8B82CEF51D9C17DE007182AA = { CreatedOnToolsVersion = 8.0; @@ -771,7 +771,7 @@ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; CODE_SIGN_IDENTITY = "iPhone Developer"; - GTM_HOST_OTHER_LDFLAGS = "-ObjC -lz -read_only_relocs suppress"; + GTM_HOST_OTHER_LDFLAGS = "-ObjC -lz"; INFOPLIST_FILE = "UnitTest-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -784,7 +784,7 @@ baseConfigurationReference = F4A0A95F140438B90010B64B /* ReleaseiOS.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; - GTM_HOST_OTHER_LDFLAGS = "-ObjC -lz -read_only_relocs suppress"; + GTM_HOST_OTHER_LDFLAGS = "-ObjC -lz"; INFOPLIST_FILE = "UnitTest-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -798,11 +798,31 @@ buildSettings = { "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_SHADOW = YES; GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter"; GTM_HOST_GCC_PREPROCESSOR_DEFINITIONS = "GTM_USING_XCTEST=1"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_NO_PIE = YES; + ONLY_ACTIVE_ARCH = YES; }; name = Debug; }; @@ -811,6 +831,7 @@ buildSettings = { GTM_HOST_GCC_PREPROCESSOR_DEFINITIONS = "GTM_USING_XCTEST=0 GTM_IPHONE_USE_SENTEST=0"; INFOPLIST_FILE = "GTMiPhone-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = com.google.GTMiPhone; PRODUCT_NAME = GTMiPhoneTest; }; name = Debug; @@ -819,6 +840,24 @@ isa = XCBuildConfiguration; baseConfigurationReference = F4A0A95F140438B90010B64B /* ReleaseiOS.xcconfig */; buildSettings = { + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_SHADOW = YES; GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter"; GTM_HOST_GCC_PREPROCESSOR_DEFINITIONS = "GTM_USING_XCTEST=1"; @@ -832,6 +871,7 @@ buildSettings = { GTM_HOST_GCC_PREPROCESSOR_DEFINITIONS = "GTM_USING_XCTEST=0 GTM_IPHONE_USE_SENTEST=0"; INFOPLIST_FILE = "GTMiPhone-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = com.google.GTMiPhone; PRODUCT_NAME = GTMiPhoneTest; }; name = Release; diff --git a/UnitTest-Info.plist b/UnitTest-Info.plist index 8f36dfe..460a7d9 100644 --- a/UnitTest-Info.plist +++ b/UnitTest-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.google.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/UnitTesting/GTMUIUnitTestingHarness/Info.plist b/UnitTesting/GTMUIUnitTestingHarness/Info.plist index 11355f7..67b771a 100644 --- a/UnitTesting/GTMUIUnitTestingHarness/Info.plist +++ b/UnitTesting/GTMUIUnitTestingHarness/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile CFBundleIdentifier - com.google.GTMUIUnitTestingHarness + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -18,10 +18,6 @@ APPL CFBundleSignature ???? - CFBundleVersion - 1.0 - NSMainNibFile - MainMenu CFBundleURLTypes @@ -65,6 +61,10 @@ + CFBundleVersion + 1.0 + NSMainNibFile + MainMenu NSPrincipalClass NSApplication -- cgit v1.2.3