aboutsummaryrefslogtreecommitdiff
path: root/GTM.xcodeproj
diff options
context:
space:
mode:
authorGravatar Thomas Van Lenten <thomasvl@google.com>2018-11-15 09:35:41 -0500
committerGravatar Thomas Van Lenten <thomasvl@google.com>2018-11-15 13:08:32 -0500
commit555c434a7d64ad7de9907bb0f0baf8f6cca685f9 (patch)
tree0e73d69a47d1bf856656955514a5caa4a73a4ddd /GTM.xcodeproj
parent2d1c003f0c124182e5ceb549574a53aa9bf6c5d7 (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 'GTM.xcodeproj')
-rw-r--r--GTM.xcodeproj/project.pbxproj18
-rw-r--r--GTM.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist8
-rw-r--r--GTM.xcodeproj/xcshareddata/xcschemes/GTM.xcscheme119
3 files changed, 144 insertions, 1 deletions
diff --git a/GTM.xcodeproj/project.pbxproj b/GTM.xcodeproj/project.pbxproj
index 6f56b9d..363f2a1 100644
--- a/GTM.xcodeproj/project.pbxproj
+++ b/GTM.xcodeproj/project.pbxproj
@@ -949,7 +949,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = NO;
- LastUpgradeCheck = 0900;
+ LastUpgradeCheck = 0940;
};
buildConfigurationList = 1DEB918108733D990010E9CD /* Build configuration list for PBXProject "GTM" */;
compatibilityVersion = "Xcode 3.1";
@@ -1260,11 +1260,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;
@@ -1287,6 +1289,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F48FE2430D197F9A009257D2 /* LoadableBundle.xcconfig */;
buildSettings = {
+ CLANG_ENABLE_OBJC_WEAK = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
@@ -1301,6 +1304,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F48FE2420D197F9A009257D2 /* DebugUnittest.xcconfig */;
buildSettings = {
+ CLANG_ENABLE_OBJC_WEAK = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)",
@@ -1317,6 +1321,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F48FE2420D197F9A009257D2 /* DebugUnittest.xcconfig */;
buildSettings = {
+ CLANG_ENABLE_OBJC_WEAK = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(value)",
"$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)",
@@ -1332,6 +1337,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F48FE2420D197F9A009257D2 /* DebugUnittest.xcconfig */;
buildSettings = {
+ CLANG_ENABLE_OBJC_WEAK = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(value)",
"$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)",
@@ -1345,6 +1351,7 @@
F4CC9F2F148E5DEB00B7D68C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_ENABLE_OBJC_WEAK = YES;
PRODUCT_NAME = GTMServiceManagementTestingHarness;
};
name = Debug;
@@ -1352,6 +1359,7 @@
F4CC9F30148E5DEB00B7D68C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_ENABLE_OBJC_WEAK = YES;
INFOPLIST_FILE = UnitTesting/GTMUIUnitTestingHarness/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = com.google.GTMUIUnitTestingHarness;
PRODUCT_NAME = GTMUIUnitTestingHarness;
@@ -1366,11 +1374,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;
@@ -1391,6 +1401,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F48FE2430D197F9A009257D2 /* LoadableBundle.xcconfig */;
buildSettings = {
+ CLANG_ENABLE_OBJC_WEAK = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
@@ -1405,6 +1416,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F48FE2450D197F9A009257D2 /* ReleaseUnittest.xcconfig */;
buildSettings = {
+ CLANG_ENABLE_OBJC_WEAK = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)",
@@ -1421,6 +1433,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F48FE2450D197F9A009257D2 /* ReleaseUnittest.xcconfig */;
buildSettings = {
+ CLANG_ENABLE_OBJC_WEAK = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(value)",
"$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)",
@@ -1436,6 +1449,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F48FE2450D197F9A009257D2 /* ReleaseUnittest.xcconfig */;
buildSettings = {
+ CLANG_ENABLE_OBJC_WEAK = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(value)",
"$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)",
@@ -1449,6 +1463,7 @@
F4CC9F3A148E5DF700B7D68C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_ENABLE_OBJC_WEAK = YES;
PRODUCT_NAME = GTMServiceManagementTestingHarness;
};
name = Release;
@@ -1456,6 +1471,7 @@
F4CC9F3B148E5DF700B7D68C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_ENABLE_OBJC_WEAK = YES;
INFOPLIST_FILE = UnitTesting/GTMUIUnitTestingHarness/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = com.google.GTMUIUnitTestingHarness;
PRODUCT_NAME = GTMUIUnitTestingHarness;
diff --git a/GTM.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/GTM.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/GTM.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/GTM.xcodeproj/xcshareddata/xcschemes/GTM.xcscheme b/GTM.xcodeproj/xcshareddata/xcschemes/GTM.xcscheme
new file mode 100644
index 0000000..77656fe
--- /dev/null
+++ b/GTM.xcodeproj/xcshareddata/xcschemes/GTM.xcscheme
@@ -0,0 +1,119 @@
+<?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 = "F42E086C0D199A5B00D5DDE0"
+ BuildableName = "GoogleToolboxForMac.framework"
+ BlueprintName = "GTM"
+ ReferencedContainer = "container:GTM.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 = "8B45A0270DA4696C001148C5"
+ BuildableName = "UnitTest-UnitTesting.xctest"
+ BlueprintName = "UnitTest-UnitTesting"
+ ReferencedContainer = "container:GTM.xcodeproj">
+ </BuildableReference>
+ </TestableReference>
+ <TestableReference
+ skipped = "NO">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "F42E08110D19987200D5DDE0"
+ BuildableName = "UnitTest-Foundation.xctest"
+ BlueprintName = "UnitTest-Foundation"
+ ReferencedContainer = "container:GTM.xcodeproj">
+ </BuildableReference>
+ </TestableReference>
+ <TestableReference
+ skipped = "NO">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "F48FE2630D198C1E009257D2"
+ BuildableName = "UnitTest-AppKit.xctest"
+ BlueprintName = "UnitTest-AppKit"
+ ReferencedContainer = "container:GTM.xcodeproj">
+ </BuildableReference>
+ </TestableReference>
+ </Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "F42E086C0D199A5B00D5DDE0"
+ BuildableName = "GoogleToolboxForMac.framework"
+ BlueprintName = "GTM"
+ ReferencedContainer = "container:GTM.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 = "F42E086C0D199A5B00D5DDE0"
+ BuildableName = "GoogleToolboxForMac.framework"
+ BlueprintName = "GTM"
+ ReferencedContainer = "container:GTM.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "F42E086C0D199A5B00D5DDE0"
+ BuildableName = "GoogleToolboxForMac.framework"
+ BlueprintName = "GTM"
+ ReferencedContainer = "container:GTM.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>