Xcode 12 bare minimum (#713)

zwaldowski · web-flow · commit 6726fba9d511 · 2020-11-26T16:11:01.000-05:00
* Xcode 12: Update to clang-format 11.0.0

* Xcode 12: Silence upgrade warnings

* Xcode 12: Requires iOS 9 minimum

* Xcode 12: Disable implicit ASi build
diff --git a/GitUp/GitUp.xcodeproj/project.pbxproj b/GitUp/GitUp.xcodeproj/project.pbxproj
@@ -392,7 +392,7 @@
 		E2C338A319F8562F00063D95 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					E21DCAE71B253847006424E8 = {
diff --git a/GitUp/GitUp.xcodeproj/xcshareddata/xcschemes/Application.xcscheme b/GitUp/GitUp.xcodeproj/xcshareddata/xcschemes/Application.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1220"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/GitUp/GitUp.xcodeproj/xcshareddata/xcschemes/Tool.xcscheme b/GitUp/GitUp.xcodeproj/xcshareddata/xcschemes/Tool.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:GitUp.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:GitUp.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/GitUpKit/Core/GCPrivate.m b/GitUpKit/Core/GCPrivate.m
@@ -171,7 +171,6 @@ - (BOOL)_runWithDefaultInterpreter:(BOOL)useSH arguments:(NSArray*)arguments std
   return success;
 }
 
-
 - (BOOL)runWithArguments:(NSArray*)arguments stdin:(NSData*)stdin stdout:(NSData**)stdout stderr:(NSData**)stderr exitStatus:(int*)exitStatus error:(NSError**)error {
   return [self _runWithDefaultInterpreter:NO arguments:arguments stdin:stdin stdout:stdout stderr:stderr exitStatus:exitStatus error:error] || (self.fallBackToDefaultInterpreter && [self _runWithDefaultInterpreter:YES arguments:arguments stdin:stdin stdout:stdout stderr:stderr exitStatus:exitStatus error:error]);
 }
diff --git a/GitUpKit/GitUpKit.xcodeproj/project.pbxproj b/GitUpKit/GitUpKit.xcodeproj/project.pbxproj
@@ -1283,7 +1283,7 @@
 		E2C338A319F8562F00063D95 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					E217531A1B91613300BE234A = {
diff --git a/GitUpKit/GitUpKit.xcodeproj/xcshareddata/xcschemes/GitUpKit (OSX).xcscheme b/GitUpKit/GitUpKit.xcodeproj/xcshareddata/xcschemes/GitUpKit (OSX).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,15 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      enableAddressSanitizer = "YES"
-      shouldUseLaunchSchemeArgsEnv = "NO">
+      shouldUseLaunchSchemeArgsEnv = "NO"
+      enableAddressSanitizer = "YES">
+      <AdditionalOptions>
+         <AdditionalOption
+            key = "NSZombieEnabled"
+            value = "YES"
+            isEnabled = "YES">
+         </AdditionalOption>
+      </AdditionalOptions>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -40,13 +47,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <AdditionalOptions>
-         <AdditionalOption
-            key = "NSZombieEnabled"
-            value = "YES"
-            isEnabled = "YES">
-         </AdditionalOption>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -67,8 +67,6 @@
             ReferencedContainer = "container:GitUpKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/GitUpKit/GitUpKit.xcodeproj/xcshareddata/xcschemes/GitUpKit (iOS).xcscheme b/GitUpKit/GitUpKit.xcodeproj/xcshareddata/xcschemes/GitUpKit (iOS).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:GitUpKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/GitUpKit/Third-Party/libgit2.xcodeproj/project.pbxproj b/GitUpKit/Third-Party/libgit2.xcodeproj/project.pbxproj
@@ -1149,7 +1149,7 @@
 		E217485D1B911B5200BE234A /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					E2174BD41B91240400BE234A = {
@@ -1522,6 +1522,7 @@
 					"-Wno-incompatible-pointer-types",
 					"-Wno-shorten-64-to-32",
 					"-Wno-format",
+					"-Wno-bool-operation",
 				);
 			};
 			name = Debug;
@@ -1569,6 +1570,7 @@
 					"-Wno-incompatible-pointer-types",
 					"-Wno-shorten-64-to-32",
 					"-Wno-format",
+					"-Wno-bool-operation",
 				);
 			};
 			name = Release;
diff --git a/GitUpKit/Third-Party/libgit2.xcodeproj/xcshareddata/xcschemes/libgit2 (OSX).xcscheme b/GitUpKit/Third-Party/libgit2.xcodeproj/xcshareddata/xcschemes/libgit2 (OSX).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -42,8 +40,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/GitUpKit/Third-Party/libgit2.xcodeproj/xcshareddata/xcschemes/libgit2 (iOS).xcscheme b/GitUpKit/Third-Party/libgit2.xcodeproj/xcshareddata/xcschemes/libgit2 (iOS).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -42,15 +40,22 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E2174C5D1B9125C500BE234A"
+            BuildableName = "libgit2.a"
+            BlueprintName = "libgit2 (iOS)"
+            ReferencedContainer = "container:libgit2.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/Xcode-Configurations/Base.xcconfig b/Xcode-Configurations/Base.xcconfig
@@ -1,14 +1,14 @@
-ARCHS[sdk=macosx*] = $(ARCHS_STANDARD_64_BIT)
-ARCHS[sdk=iphonesimulator*] = $(ARCHS_STANDARD)
-ARCHS[sdk=iphoneos*] = $(ARCHS_STANDARD)
+ARCHS[sdk=macosx*] = x86_64
+ARCHS[sdk=iphonesimulator*] = $(ARCHS_STANDARD_64_BIT)
+ARCHS[sdk=iphoneos*] = $(ARCHS_STANDARD_64_BIT)
 
 MACOSX_DEPLOYMENT_TARGET = 10.10
-IPHONEOS_DEPLOYMENT_TARGET = 8.0
+IPHONEOS_DEPLOYMENT_TARGET = 9.0
 
 DEVELOPMENT_TEAM = 88W3E55T4B
 
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
-TARGETED_DEVICE_FAMILY = 1,2,3,4
+TARGETED_DEVICE_FAMILY = 1,2
 COPY_PHASE_STRIP = NO
 DEAD_CODE_STRIPPING = YES
 ALWAYS_SEARCH_USER_PATHS = NO
@@ -34,6 +34,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES
 CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO
 CLANG_WARN_OBJC_LITERAL_CONVERSION = YES
 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR
+CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
 CLANG_WARN_RANGE_LOOP_ANALYSIS = YES
 CLANG_WARN_STRICT_PROTOTYPES = NO
 CLANG_WARN_SUSPICIOUS_MOVE = YES
@@ -46,6 +47,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES
 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE
 GCC_WARN_UNUSED_FUNCTION = YES
 GCC_WARN_UNUSED_VARIABLE = YES
+SUPPORTS_MACCATALYST = NO
 
 ENABLE_HARDENED_RUNTIME[sdk=macosx*] = YES
 
diff --git a/format-source.sh b/format-source.sh
@@ -3,7 +3,7 @@
 # brew install clang-format
 
 CLANG_FORMAT_VERSION=`clang-format -version | awk '{ print $3 }'`
-if [[ "$CLANG_FORMAT_VERSION" != "9.0.0" ]]; then
+if [[ "$CLANG_FORMAT_VERSION" != "11.0.0" ]]; then
   echo "Unsupported clang-format version"
   exit 1
 fi

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,6 @@ - (BOOL)_runWithDefaultInterpreter:(BOOL)useSH arguments:(NSArray*)arguments std`
`171`	`171`	`return success;`
`172`	`172`	`}`
`173`	`173`
`174`		`-`
`175`	`174`	`- (BOOL)runWithArguments:(NSArray)arguments stdin:(NSData)stdin stdout:(NSData)stdout stderr:(NSData)stderr exitStatus:(int)exitStatus error:(NSError*)error {`
`176`	`175`	`return [self _runWithDefaultInterpreter:NO arguments:arguments stdin:stdin stdout:stdout stderr:stderr exitStatus:exitStatus error:error] \|\| (self.fallBackToDefaultInterpreter && [self _runWithDefaultInterpreter:YES arguments:arguments stdin:stdin stdout:stdout stderr:stderr exitStatus:exitStatus error:error]);`
`177`	`176`	`}`