From 542224f39d675a2c064ab70196d57eff14bfc8f6 Mon Sep 17 00:00:00 2001
From: Jens Ayton <jens@oolite.org>
Date: Thu, 5 May 2016 16:13:30 +0200
Subject: [PATCH] Update basic project requirement to Xcode 7.1

---
 Oolite.xcodeproj/project.pbxproj              | 51 +++++++++++++++++--
 .../xcschemes/Oolite - Debug.xcscheme         |  2 +-
 .../xcschemes/Oolite - Deployment.xcscheme    |  2 +-
 .../xcschemes/Oolite - Test Release.xcscheme  |  2 +-
 src/Cocoa/oolite-warnings.xcconfig            | 10 +---
 5 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/Oolite.xcodeproj/project.pbxproj b/Oolite.xcodeproj/project.pbxproj
index 2e1e96a7..28a74b99 100644
--- a/Oolite.xcodeproj/project.pbxproj
+++ b/Oolite.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 47;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -3481,11 +3481,11 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0730;
 				ORGANIZATIONNAME = "the Oolite team";
 			};
 			buildConfigurationList = 08B31CB008FE63D70038D42F /* Build configuration list for PBXProject "Oolite" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 6.3";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -4115,8 +4115,23 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 1AD88FAF103F29D300AA36F4 /* oolite-options.xcconfig */;
 			buildSettings = {
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS_QUOTED_1)";
 				ONLY_ACTIVE_ARCH = YES;
 			};
@@ -4126,6 +4141,21 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 1AD88FAF103F29D300AA36F4 /* oolite-options.xcconfig */;
 			buildSettings = {
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = 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_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS_QUOTED_1)";
 			};
 			name = Deployment;
@@ -4172,6 +4202,21 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 1AD88FAF103F29D300AA36F4 /* oolite-options.xcconfig */;
 			buildSettings = {
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = 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_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS_QUOTED_1)";
 			};
 			name = TestRelease;
diff --git a/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Debug.xcscheme b/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Debug.xcscheme
index 5ae21d1e..0fa8adda 100644
--- a/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Debug.xcscheme	
+++ b/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Debug.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Deployment.xcscheme b/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Deployment.xcscheme
index ad011d93..ecef1926 100644
--- a/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Deployment.xcscheme	
+++ b/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Deployment.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Test Release.xcscheme b/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Test Release.xcscheme
index 2e9ba1c0..af23ec12 100644
--- a/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Test Release.xcscheme	
+++ b/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Test Release.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/src/Cocoa/oolite-warnings.xcconfig b/src/Cocoa/oolite-warnings.xcconfig
index 1a58d09e..d5023f04 100644
--- a/src/Cocoa/oolite-warnings.xcconfig
+++ b/src/Cocoa/oolite-warnings.xcconfig
@@ -36,25 +36,17 @@ OO_WARNING_EXCEPTIONS					= -Wno-unused-parameter -Wno-missing-field-initializer
 // -Wassign-enum: Correctly warns about Cocoa's abuse of enum types for bit
 //     masks, which we can't do anything sensible about.
 // -Wvla: We use variable-length arrays with reckless abandon.
-OO_EXTRA_WARNING_EXCEPTIONS				= -Wno-pedantic -Wno-gnu -Wno-undef -Wno-objc-interface-ivars -Wno-direct-ivar-access -Wno-receiver-forward-class -Wno-padded -Wno-float-equal -Wno-switch-enum -Wno-cast-align -Wno-unused-exception-parameter -Wno-missing-noreturn -Wno-unreachable-code -Wno-used-but-marked-unused -Wno-format-nonliteral -Wno-conditional-uninitialized -Wno-bad-function-cast -Wno-assign-enum -Wno-vla -Wno-auto-import $(OO_VERSION_SPECIFIC_WARNING_EXCEPTIONS_$(XCODE_VERSION_MINOR))
-
-// New warnings in Xcode 6.3:
 // -Rmodule-build: Very chatty remarks about the Clang module system that we
 //     don't care about
 // -Wcstring-format-directive Warning when using %s in NSString formatting,
 //     unfortunately this is triggered by NSParameterAssert
-OO_VERSION_SPECIFIC_WARNING_EXCEPTIONS_0630 = -Rno-module-build -Wno-cstring-format-directive
-OO_VERSION_SPECIFIC_WARNING_EXCEPTIONS_0640 = $OO_VERSION_SPECIFIC_WARNING_EXCEPTIONS_0630
-
-// New warnings in Xcode 7:
 // -Wreserved-id-macro: use of initial underscores in macros, invalid but used
 //     in libaries
 // -Wnullable-to-nonnull-conversion: ill-considered Swift compatibilit feature
 //     we don't care about
 // -Wcast-qual: strict checking of const/volatile qualifier cast rules, which
 //     are incompatible with most real code. Including the C standard library.
-OO_VERSION_SPECIFIC_WARNING_EXCEPTIONS_0700 = $OO_VERSION_SPECIFIC_WARNING_EXCEPTIONS_0640 -Wno-reserved-id-macro -Wno-nullable-to-nonnull-conversion -Wno-cast-qual
-OO_VERSION_SPECIFIC_WARNING_EXCEPTIONS_0710 = $OO_VERSION_SPECIFIC_WARNING_EXCEPTIONS_0700
+OO_EXTRA_WARNING_EXCEPTIONS				= -Wno-pedantic -Wno-gnu -Wno-undef -Wno-objc-interface-ivars -Wno-direct-ivar-access -Wno-receiver-forward-class -Wno-padded -Wno-float-equal -Wno-switch-enum -Wno-cast-align -Wno-unused-exception-parameter -Wno-missing-noreturn -Wno-unreachable-code -Wno-used-but-marked-unused -Wno-format-nonliteral -Wno-conditional-uninitialized -Wno-bad-function-cast -Wno-assign-enum -Wno-vla -Wno-auto-import -Rno-module-build -Wno-cstring-format-directive -Wno-reserved-id-macro -Wno-nullable-to-nonnull-conversion -Wno-cast-qual $(OO_VERSION_SPECIFIC_WARNING_EXCEPTIONS_$(XCODE_VERSION_MINOR))
 
 // Things we don't want to break the build when they're introduced by devs on other platforms.
 OO_WARNING_NO_ERROR						= -Wno-error=deprecated-declarations -Wno-error=semicolon-before-method-body