diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2018-11-15 09:35:41 -0500 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2018-11-15 13:08:32 -0500 |
commit | 555c434a7d64ad7de9907bb0f0baf8f6cca685f9 (patch) | |
tree | 0e73d69a47d1bf856656955514a5caa4a73a4ddd /GTMiPhone.xcodeproj | |
parent | 2d1c003f0c124182e5ceb549574a53aa9bf6c5d7 (diff) |
Project modernization.
- Create shared scheme to use.
- Let Xcode (9.4.1) update the project files and add some warnings.
- Remove -finalize (GC days are gone)
- Add some more pragmas to compile cleanly.
- The iOS targets had a mix of 7.0 and 8.0 min versions, so make them
all 8.
Diffstat (limited to 'GTMiPhone.xcodeproj')
3 files changed, 120 insertions, 3 deletions
diff --git a/GTMiPhone.xcodeproj/project.pbxproj b/GTMiPhone.xcodeproj/project.pbxproj index b417ab4..c290630 100644 --- a/GTMiPhone.xcodeproj/project.pbxproj +++ b/GTMiPhone.xcodeproj/project.pbxproj @@ -539,7 +539,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0940; TargetAttributes = { 8B82CEF51D9C17DE007182AA = { CreatedOnToolsVersion = 8.0; @@ -692,6 +692,7 @@ buildSettings = { "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = GTM; }; name = Debug; @@ -700,6 +701,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F4A0A95F140438B90010B64B /* ReleaseiOS.xcconfig */; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = GTM; }; name = Release; @@ -710,6 +712,7 @@ buildSettings = { "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; GTM_HOST_OTHER_LDFLAGS = "-ObjC -lz"; INFOPLIST_FILE = "UnitTest-Info.plist"; @@ -723,6 +726,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F4A0A95F140438B90010B64B /* ReleaseiOS.xcconfig */; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; GTM_HOST_OTHER_LDFLAGS = "-ObjC -lz"; INFOPLIST_FILE = "UnitTest-Info.plist"; @@ -742,11 +746,13 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; @@ -760,7 +766,7 @@ 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; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_NO_PIE = YES; ONLY_ACTIVE_ARCH = YES; }; @@ -769,6 +775,7 @@ F4A0A964140438D50010B64B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; 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; @@ -784,11 +791,13 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; @@ -801,7 +810,7 @@ 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; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_NO_PIE = YES; }; name = Release; @@ -809,6 +818,7 @@ F4A0A96E140438ED0010B64B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; 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; diff --git a/GTMiPhone.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/GTMiPhone.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/GTMiPhone.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>IDEDidComputeMac32BitWarning</key> + <true/> +</dict> +</plist> diff --git a/GTMiPhone.xcodeproj/xcshareddata/xcschemes/GTMiPhone.xcscheme b/GTMiPhone.xcodeproj/xcshareddata/xcschemes/GTMiPhone.xcscheme new file mode 100644 index 0000000..cc7d3f2 --- /dev/null +++ b/GTMiPhone.xcodeproj/xcshareddata/xcschemes/GTMiPhone.xcscheme @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scheme + LastUpgradeVersion = "0940" + version = "1.3"> + <BuildAction + parallelizeBuildables = "YES" + buildImplicitDependencies = "NO"> + <BuildActionEntries> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8B82CEF51D9C17DE007182AA" + BuildableName = "libGTM.a" + BlueprintName = "GTM" + ReferencedContainer = "container:GTMiPhone.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + shouldUseLaunchSchemeArgsEnv = "YES"> + <Testables> + <TestableReference + skipped = "NO"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8B82CF211D9C1C7D007182AA" + BuildableName = "GTMTests.xctest" + BlueprintName = "GTMTests" + ReferencedContainer = "container:GTMiPhone.xcodeproj"> + </BuildableReference> + </TestableReference> + </Testables> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8B82CEF51D9C17DE007182AA" + BuildableName = "libGTM.a" + BlueprintName = "GTM" + ReferencedContainer = "container:GTMiPhone.xcodeproj"> + </BuildableReference> + </MacroExpansion> + <AdditionalOptions> + </AdditionalOptions> + </TestAction> + <LaunchAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + launchStyle = "0" + useCustomWorkingDirectory = "NO" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + debugServiceExtension = "internal" + allowLocationSimulation = "YES"> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8B82CEF51D9C17DE007182AA" + BuildableName = "libGTM.a" + BlueprintName = "GTM" + ReferencedContainer = "container:GTMiPhone.xcodeproj"> + </BuildableReference> + </MacroExpansion> + <AdditionalOptions> + </AdditionalOptions> + </LaunchAction> + <ProfileAction + buildConfiguration = "Release" + shouldUseLaunchSchemeArgsEnv = "YES" + savedToolIdentifier = "" + useCustomWorkingDirectory = "NO" + debugDocumentVersioning = "YES"> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8B82CEF51D9C17DE007182AA" + BuildableName = "libGTM.a" + BlueprintName = "GTM" + ReferencedContainer = "container:GTMiPhone.xcodeproj"> + </BuildableReference> + </MacroExpansion> + </ProfileAction> + <AnalyzeAction + buildConfiguration = "Debug"> + </AnalyzeAction> + <ArchiveAction + buildConfiguration = "Release" + revealArchiveInOrganizer = "YES"> + </ArchiveAction> +</Scheme> |