Update Xcodeproj to 8.24.3 (#1515)

* Update Xcodeproj to 8.24.3

* Bump macOS version

* maintain support for removed gpuValidationMode enum

---------

Co-authored-by: Yonas Kolb <yonaskolb@users.noreply.github.com>

Author: marcosgriselli

Docs/ProjectSpec.md

@@ -1028,7 +1028,7 @@ The different actions share some properties:
 - [ ] **postActions**: **[[Execution Action](#execution-action)]** - Scripts that are run *after* the action
 - [ ] **environmentVariables**: **[[Environment Variable](#environment-variable)]** or **[String:String]** - `run`, `test` and `profile` actions can define the environment variables. When passing a dictionary, every key-value entry maps to a corresponding variable that is enabled.
 - [ ] **enableGPUFrameCaptureMode**: **GPUFrameCaptureMode** - Property value set for `GPU Frame Capture`. Possible values are `autoEnabled`, `metal`, `openGL`, `disabled`. Default is `autoEnabled`.
-- [ ] **enableGPUValidationMode**: **GPUValidationMode** - Property value set for `Metal API Validation`. Possible values are `enabled`, `disabled`, `extended`. Default is `enabled`.
+- [ ] **enableGPUValidationMode**: **Bool** - Property value set for `Metal API Validation`. This defaults to true.
 - [ ] **disableMainThreadChecker**: **Bool** - `run` and `test` actions can define a boolean that indicates that this scheme should disable the Main Thread Checker. This defaults to false
 - [ ] **stopOnEveryMainThreadCheckerIssue**: **Bool** - a boolean that indicates if this scheme should stop at every Main Thread Checker issue. This defaults to false
 - [ ] **disableThreadPerformanceChecker**: **Bool** - `run` action can define a boolean that indicates that this scheme should disable the Thread Performance Checker. This defaults to false

Package.resolved

@@ -16,7 +16,7 @@ let package = Package(
         .package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.2.0"),
         .package(url: "https://github.com/kylef/Spectre.git", from: "0.9.2"),
         .package(url: "https://github.com/onevcat/Rainbow.git", from: "4.0.0"),
-        .package(url: "https://github.com/tuist/XcodeProj.git", exact: "8.16.0"),
+        .package(url: "https://github.com/tuist/XcodeProj.git", exact: "8.24.3"),
         .package(url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.3"),
         .package(url: "https://github.com/mxcl/Version", from: "2.0.0"),
         .package(url: "https://github.com/freddi-kit/ArtifactBundleGen", exact: "0.0.6")

Package.swift

@@ -131,14 +131,15 @@ public struct Scheme: Equatable {
         public static let stopOnEveryMainThreadCheckerIssueDefault = false
         public static let disableThreadPerformanceCheckerDefault = false
         public static let debugEnabledDefault = true
+        public static let enableGPUValidationModeDefault = true
 
         public var config: String?
         public var commandLineArguments: [String: Bool]
         public var preActions: [ExecutionAction]
         public var postActions: [ExecutionAction]
         public var environmentVariables: [XCScheme.EnvironmentVariable]
         public var enableGPUFrameCaptureMode: XCScheme.LaunchAction.GPUFrameCaptureMode
-        public var enableGPUValidationMode: XCScheme.LaunchAction.GPUValidationMode
+        public var enableGPUValidationMode: Bool
         public var disableMainThreadChecker: Bool
         public var stopOnEveryMainThreadCheckerIssue: Bool
         public var disableThreadPerformanceChecker: Bool
@@ -161,7 +162,7 @@ public struct Scheme: Equatable {
             postActions: [ExecutionAction] = [],
             environmentVariables: [XCScheme.EnvironmentVariable] = [],
             enableGPUFrameCaptureMode: XCScheme.LaunchAction.GPUFrameCaptureMode = XCScheme.LaunchAction.defaultGPUFrameCaptureMode,
-            enableGPUValidationMode: XCScheme.LaunchAction.GPUValidationMode = XCScheme.LaunchAction.GPUValidationMode.enabled,
+            enableGPUValidationMode: Bool = enableGPUValidationModeDefault,
             disableMainThreadChecker: Bool = disableMainThreadCheckerDefault,
             stopOnEveryMainThreadCheckerIssue: Bool = stopOnEveryMainThreadCheckerIssueDefault,
             disableThreadPerformanceChecker: Bool = disableThreadPerformanceCheckerDefault,
@@ -488,10 +489,16 @@ extension Scheme.Run: JSONObjectConvertible {
         } else {
             enableGPUFrameCaptureMode = XCScheme.LaunchAction.defaultGPUFrameCaptureMode
         }
+
+        // support deprecated gpuValidationMode enum that was removed from XcodeProj
         if let gpuValidationMode: String = jsonDictionary.json(atKeyPath: "enableGPUValidationMode") {
-            enableGPUValidationMode = XCScheme.LaunchAction.GPUValidationMode.fromJSONValue(gpuValidationMode)
+            switch gpuValidationMode {
+            case "enabled", "extended": enableGPUValidationMode = true
+            case "disabled": enableGPUValidationMode = false
+            default: enableGPUValidationMode = Scheme.Run.enableGPUValidationModeDefault
+            }
         } else {
-            enableGPUValidationMode = XCScheme.LaunchAction.defaultGPUValidationMode
+            enableGPUValidationMode = jsonDictionary.json(atKeyPath: "enableGPUValidationMode") ?? Scheme.Run.enableGPUValidationModeDefault
         }
         disableMainThreadChecker = jsonDictionary.json(atKeyPath: "disableMainThreadChecker") ?? Scheme.Run.disableMainThreadCheckerDefault
         stopOnEveryMainThreadCheckerIssue = jsonDictionary.json(atKeyPath: "stopOnEveryMainThreadCheckerIssue") ?? Scheme.Run.stopOnEveryMainThreadCheckerIssueDefault
@@ -539,8 +546,8 @@ extension Scheme.Run: JSONEncodable {
             dict["enableGPUFrameCaptureMode"] = enableGPUFrameCaptureMode.toJSONValue()
         }
 
-        if enableGPUValidationMode != XCScheme.LaunchAction.defaultGPUValidationMode {
-            dict["enableGPUValidationMode"] = enableGPUValidationMode.toJSONValue()
+        if enableGPUValidationMode != Scheme.Run.enableGPUValidationModeDefault {
+            dict["enableGPUValidationMode"] = enableGPUValidationMode
         }
 
         if disableMainThreadChecker != Scheme.Run.disableMainThreadCheckerDefault {
@@ -1002,32 +1009,6 @@ extension XCScheme.LaunchAction.GPUFrameCaptureMode: JSONEncodable {
     }
 }
 
-extension XCScheme.LaunchAction.GPUValidationMode: JSONEncodable {
-    public func toJSONValue() -> Any {
-        switch self {
-        case .enabled:
-            return "enabled"
-        case .disabled:
-            return "disabled"
-        case .extended:
-            return "extended"
-        }
-    }
-    
-    static func fromJSONValue(_ string: String) -> XCScheme.LaunchAction.GPUValidationMode {
-        switch string {
-        case "enabled":
-            return .enabled
-        case "disabled":
-            return .disabled
-        case "extended":
-            return .extended
-        default:
-            fatalError("Invalid enableGPUValidationMode value. Valid values are: enable, disable, extended")
-        }
-    }
-}
-
 extension XCScheme.TestAction.ScreenCaptureFormat: JSONEncodable {
     public func toJSONValue() -> Any {
         rawValue

Sources/ProjectSpec/Scheme.swift

@@ -102,6 +102,8 @@ public class PBXProjGenerator {
                 name: project.name,
                 buildConfigurationList: buildConfigList,
                 compatibilityVersion: project.compatibilityVersion,
+                preferredProjectObjectVersion: Int(project.objectVersion),
+                minimizedProjectReferenceProxies: project.minimizedProjectReferenceProxies,
                 mainGroup: mainGroup,
                 developmentRegion: developmentRegion
             )

Sources/XcodeGenKit/PBXProjGenerator.swift

@@ -358,7 +358,7 @@ public class SchemeGenerator {
             allowLocationSimulation: allowLocationSimulation,
             locationScenarioReference: locationScenarioReference,
             enableGPUFrameCaptureMode: scheme.run?.enableGPUFrameCaptureMode ?? XCScheme.LaunchAction.defaultGPUFrameCaptureMode,
-            enableGPUValidationMode: scheme.run?.enableGPUValidationMode ?? XCScheme.LaunchAction.defaultGPUValidationMode,
+            disableGPUValidationMode: !(scheme.run?.enableGPUValidationMode ?? Scheme.Run.enableGPUValidationModeDefault),
             disableMainThreadChecker: scheme.run?.disableMainThreadChecker ?? Scheme.Run.disableMainThreadCheckerDefault,
             disablePerformanceAntipatternChecker: scheme.run?.disableThreadPerformanceChecker ?? Scheme.Run.disableThreadPerformanceCheckerDefault,
             stopOnEveryMainThreadCheckerIssue: scheme.run?.stopOnEveryMainThreadCheckerIssue ?? Scheme.Run.stopOnEveryMainThreadCheckerIssueDefault,

Sources/XcodeGenKit/SchemeGenerator.swift

@@ -18,6 +18,10 @@ extension Project {
     var objectVersion: UInt {
         54
     }
+
+    var minimizedProjectReferenceProxies: Int {
+        1
+    }
 }
 
 public struct XCodeVersion {

Sources/XcodeGenKit/Version.swift

@@ -254,6 +254,8 @@
 			dependencies = (
 			);
 			name = Framework_tvOS;
+			packageProductDependencies = (
+			);
 			productName = Framework_tvOS;
 			productReference = 7D67F1C1BFBACE101DE7DB51 /* Framework.framework */;
 			productType = "com.apple.product-type.framework";
@@ -270,6 +272,8 @@
 			dependencies = (
 			);
 			name = Framework_macOS;
+			packageProductDependencies = (
+			);
 			productName = Framework_macOS;
 			productReference = 41FC82ED1C4C3B7B3D7B2FB7 /* Framework.framework */;
 			productType = "com.apple.product-type.framework";
@@ -286,6 +290,8 @@
 			dependencies = (
 			);
 			name = Framework_watchOS;
+			packageProductDependencies = (
+			);
 			productName = Framework_watchOS;
 			productReference = 6177CC6263783487E93F7F4D /* Framework.framework */;
 			productType = "com.apple.product-type.framework";
@@ -302,6 +308,8 @@
 			dependencies = (
 			);
 			name = Framework_iOS;
+			packageProductDependencies = (
+			);
 			productName = Framework_iOS;
 			productReference = 8A9274BE42A03DC5DA1FAD04 /* Framework.framework */;
 			productType = "com.apple.product-type.framework";
@@ -326,6 +334,8 @@
 				en,
 			);
 			mainGroup = 293D0FF827366B513839236A;
+			minimizedProjectReferenceProxies = 1;
+			preferredProjectObjectVersion = 54;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (

Tests/Fixtures/CarthageProject/Project.xcodeproj/project.pbxproj

@@ -16,6 +16,8 @@
 				D287BAAB664D1A024D9DD57E /* PBXTargetDependency */,
 			);
 			name = AggTarget;
+			packageProductDependencies = (
+			);
 			productName = AggTarget;
 		};
 /* End PBXAggregateTarget section */
@@ -168,6 +170,8 @@
 				8693351DA9DBE579AC9DD513 /* PBXTargetDependency */,
 			);
 			name = Tests;
+			packageProductDependencies = (
+			);
 			productName = Tests;
 			productReference = 0613661C0D45064E81E80C37 /* Tests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
@@ -247,13 +251,15 @@
 				en,
 			);
 			mainGroup = 218F6C96DF9E182F526258CF;
+			minimizedProjectReferenceProxies = 1;
 			packageReferences = (
 				5BA91390AE78D2EE15C60091 /* XCRemoteSwiftPackageReference "Codability" */,
 				348C81C327DB1710B742C370 /* XCRemoteSwiftPackageReference "Prefire" */,
 				E3887F3CB2C069E70D98092F /* XCRemoteSwiftPackageReference "SwiftRoaring" */,
 				630A8CE9F2BE39704ED9D461 /* XCLocalSwiftPackageReference "FooFeature" */,
 				C6539B364583AE96C18CE377 /* XCLocalSwiftPackageReference "../../.." */,
 			);
+			preferredProjectObjectVersion = 54;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
@@ -637,6 +643,17 @@
 		};
 /* End XCConfigurationList section */
 
+/* Begin XCLocalSwiftPackageReference section */
+		630A8CE9F2BE39704ED9D461 /* XCLocalSwiftPackageReference "FooFeature" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = FooFeature;
+		};
+		C6539B364583AE96C18CE377 /* XCLocalSwiftPackageReference "../../.." */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = ../../..;
+		};
+/* End XCLocalSwiftPackageReference section */
+
 /* Begin XCRemoteSwiftPackageReference section */
 		348C81C327DB1710B742C370 /* XCRemoteSwiftPackageReference "Prefire" */ = {
 			isa = XCRemoteSwiftPackageReference;
@@ -664,17 +681,6 @@
 		};
 /* End XCRemoteSwiftPackageReference section */
 
-/* Begin XCLocalSwiftPackageReference section */
-		630A8CE9F2BE39704ED9D461 /* XCLocalSwiftPackageReference "FooFeature" */ = {
-			isa = XCLocalSwiftPackageReference;
-			relativePath = FooFeature;
-		};
-		C6539B364583AE96C18CE377 /* XCLocalSwiftPackageReference "../../.." */ = {
-			isa = XCLocalSwiftPackageReference;
-			relativePath = ../../..;
-		};
-/* End XCLocalSwiftPackageReference section */
-
 /* Begin XCSwiftPackageProductDependency section */
 		15DB49096E2978F6BCA8D604 /* FooUI */ = {
 			isa = XCSwiftPackageProductDependency;

Tests/Fixtures/SPM/SPM.xcodeproj/project.pbxproj

@@ -55,6 +55,8 @@
 			dependencies = (
 			);
 			name = IncludedLegacy;
+			packageProductDependencies = (
+			);
 			passBuildSettingsInEnvironment = 0;
 			productName = IncludedLegacy;
 		};
@@ -71,6 +73,8 @@
 			dependencies = (
 			);
 			name = BundleY;
+			packageProductDependencies = (
+			);
 			productName = BundleY;
 			productReference = F1EFFCA88BFC3A1DD2D89DA7 /* BundleY.bundle */;
 			productType = "com.apple.product-type.bundle";
@@ -85,6 +89,8 @@
 			dependencies = (
 			);
 			name = BundleX;
+			packageProductDependencies = (
+			);
 			productName = BundleX;
 			productReference = 6023D61BF2C57E6AE09CE7A3 /* BundleX.bundle */;
 			productType = "com.apple.product-type.bundle";
@@ -100,6 +106,8 @@
 			dependencies = (
 			);
 			name = ExternalTarget;
+			packageProductDependencies = (
+			);
 			productName = ExternalTarget;
 			productReference = D6340FC7DEBC81E0127BAFD6 /* ExternalTarget.framework */;
 			productType = "com.apple.product-type.framework";
@@ -123,6 +131,8 @@
 				en,
 			);
 			mainGroup = 4E8CFA4275C972686621210C;
+			minimizedProjectReferenceProxies = 1;
+			preferredProjectObjectVersion = 54;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (