From 5bbcb086e37bb3561eb75eaf8d7822abe08aa181 Mon Sep 17 00:00:00 2001
From: Darin Franklin <dfranklin@pobox.com>
Date: Thu, 5 Oct 2017 19:26:39 -0500
Subject: [PATCH] Update project for Xcode 9

---
 RegexForAccordance.xcodeproj/project.pbxproj  | 26 ++++++++++++++++++-
 .../xcschemes/CodeCoverage.xcscheme           |  4 ++-
 .../xcschemes/RegexForAccordance.xcscheme     |  4 ++-
 .../RegexForAccordance-Info.plist             |  2 +-
 .../RegexForAccordanceTests-Info.plist        |  2 +-
 5 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/RegexForAccordance.xcodeproj/project.pbxproj b/RegexForAccordance.xcodeproj/project.pbxproj
index f7788eb..8cc60a6 100644
--- a/RegexForAccordance.xcodeproj/project.pbxproj
+++ b/RegexForAccordance.xcodeproj/project.pbxproj
@@ -625,7 +625,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = BX;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Darin Franklin";
 				TargetAttributes = {
 					93984F6519873CA70034CB53 = {
@@ -826,14 +826,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_OBJC_ROOT_CLASS = YES_ERROR;
+				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;
@@ -875,6 +881,7 @@
 				GCC_PREFIX_HEADER = "RegexForAccordance/RegexForAccordance-Prefix.pch";
 				INFOPLIST_FILE = "RegexForAccordance/RegexForAccordance-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				PRODUCT_BUNDLE_IDENTIFIER = "dfranklin.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = RegexForAccordance;
 				WRAPPER_EXTENSION = app;
 			};
@@ -896,6 +903,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = "RegexForAccordanceTests/RegexForAccordanceTests-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "edu.self.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = RegexForAccordanceTests;
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				WRAPPER_EXTENSION = xctest;
@@ -910,14 +918,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_OBJC_ROOT_CLASS = YES_ERROR;
+				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;
@@ -955,14 +969,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_OBJC_ROOT_CLASS = YES_ERROR;
+				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;
@@ -995,6 +1015,7 @@
 				GCC_PREFIX_HEADER = "RegexForAccordance/RegexForAccordance-Prefix.pch";
 				INFOPLIST_FILE = "RegexForAccordance/RegexForAccordance-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				PRODUCT_BUNDLE_IDENTIFIER = "dfranklin.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = RegexForAccordance;
 				WRAPPER_EXTENSION = app;
 			};
@@ -1010,6 +1031,7 @@
 				GCC_PREFIX_HEADER = "RegexForAccordance/RegexForAccordance-Prefix.pch";
 				INFOPLIST_FILE = "RegexForAccordance/RegexForAccordance-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				PRODUCT_BUNDLE_IDENTIFIER = "dfranklin.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = RegexForAccordance;
 				WRAPPER_EXTENSION = app;
 			};
@@ -1031,6 +1053,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = "RegexForAccordanceTests/RegexForAccordanceTests-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "edu.self.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = RegexForAccordanceTests;
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				WRAPPER_EXTENSION = xctest;
@@ -1049,6 +1072,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "RegexForAccordance/RegexForAccordance-Prefix.pch";
 				INFOPLIST_FILE = "RegexForAccordanceTests/RegexForAccordanceTests-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "edu.self.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = RegexForAccordanceTests;
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				WRAPPER_EXTENSION = xctest;
diff --git a/RegexForAccordance.xcodeproj/xcshareddata/xcschemes/CodeCoverage.xcscheme b/RegexForAccordance.xcodeproj/xcshareddata/xcschemes/CodeCoverage.xcscheme
index 5cc783f..ffe85e6 100644
--- a/RegexForAccordance.xcodeproj/xcshareddata/xcschemes/CodeCoverage.xcscheme
+++ b/RegexForAccordance.xcodeproj/xcshareddata/xcschemes/CodeCoverage.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "GCov_Build"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "NO">
       <PostActions>
          <ExecutionAction
@@ -80,6 +81,7 @@
       buildConfiguration = "GCov_Build"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/RegexForAccordance.xcodeproj/xcshareddata/xcschemes/RegexForAccordance.xcscheme b/RegexForAccordance.xcodeproj/xcshareddata/xcschemes/RegexForAccordance.xcscheme
index 9dcde43..f9b0da7 100644
--- a/RegexForAccordance.xcodeproj/xcshareddata/xcschemes/RegexForAccordance.xcscheme
+++ b/RegexForAccordance.xcodeproj/xcshareddata/xcschemes/RegexForAccordance.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -62,6 +62,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -91,6 +92,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/RegexForAccordance/RegexForAccordance-Info.plist b/RegexForAccordance/RegexForAccordance-Info.plist
index 675d061..22793d1 100644
--- a/RegexForAccordance/RegexForAccordance-Info.plist
+++ b/RegexForAccordance/RegexForAccordance-Info.plist
@@ -36,7 +36,7 @@
 	<key>CFBundleIconFile</key>
 	<string>icon.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>dfranklin.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/RegexForAccordanceTests/RegexForAccordanceTests-Info.plist b/RegexForAccordanceTests/RegexForAccordanceTests-Info.plist
index a12b678..169b6f7 100644
--- a/RegexForAccordanceTests/RegexForAccordanceTests-Info.plist
+++ b/RegexForAccordanceTests/RegexForAccordanceTests-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>edu.self.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>