From 562b946390d5991a776b6698174d7c21280af134 Mon Sep 17 00:00:00 2001
From: Even Gabrielsen <gabrielsen.even@gmail.com>
Date: Thu, 12 Dec 2024 06:27:29 +0100
Subject: [PATCH] Bump XcodeProj to 8.25.0

Signed-off-by: Even Gabrielsen <gabrielsen.even@gmail.com>
---
 Package.resolved                                   | 4 ++--
 Package.swift                                      | 2 +-
 Tests/XCDiffCoreTests/Helpers/PBXProjBuilder.swift | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Package.resolved b/Package.resolved
index d37d6a8..5d2deed 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -60,8 +60,8 @@
         "repositoryURL": "https://github.com/tuist/xcodeproj.git",
         "state": {
           "branch": null,
-          "revision": "3797181813ee963fe305d939232bc576d23ddbb0",
-          "version": "8.15.0"
+          "revision": "d3df4265b8383dd56dae4b01f817d30c22e7612c",
+          "version": "8.25.0"
         }
       }
     ]
diff --git a/Package.swift b/Package.swift
index 4fffdc3..ced9282 100644
--- a/Package.swift
+++ b/Package.swift
@@ -25,7 +25,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/apple/swift-tools-support-core.git", from: "0.3.0"),
         .package(url: "https://github.com/kylef/PathKit", from: "1.0.0"),
-        .package(url: "https://github.com/tuist/xcodeproj.git", from: "8.15.0"),
+        .package(url: "https://github.com/tuist/xcodeproj.git", from: "8.25.0"),
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
     ],
     targets: [
diff --git a/Tests/XCDiffCoreTests/Helpers/PBXProjBuilder.swift b/Tests/XCDiffCoreTests/Helpers/PBXProjBuilder.swift
index c69d9e5..07ebefd 100644
--- a/Tests/XCDiffCoreTests/Helpers/PBXProjBuilder.swift
+++ b/Tests/XCDiffCoreTests/Helpers/PBXProjBuilder.swift
@@ -127,7 +127,7 @@ final class PBXProjBuilder {
     ) -> PBXProjBuilder {
         let package = XCRemoteSwiftPackageReference(repositoryURL: url, versionRequirement: version)
         pbxproj.add(object: package)
-        pbxproj.rootObject?.packages.append(package)
+        pbxproj.rootObject?.remotePackages.append(package)
         return self
     }
 
@@ -224,6 +224,8 @@ final class PBXProjBuilder {
         let project = PBXProject(name: name,
                                  buildConfigurationList: configurationList,
                                  compatibilityVersion: Xcode.Default.compatibilityVersion,
+                                 preferredProjectObjectVersion: nil,
+                                 minimizedProjectReferenceProxies: nil,
                                  mainGroup: mainGroup,
                                  projectDirPath: projectDirPath)
         let objects = configurationListObjects + [mainGroup, project]