From 426a73744911e9253940025f51d519adea75092b Mon Sep 17 00:00:00 2001 From: fortmarek Date: Thu, 13 Nov 2025 15:45:06 +0100 Subject: [PATCH] feat: make properties of GraphDependency.xcframework mutable --- Package.resolved | 18 +++++++++--------- .../XcodeGraph/Graph/GraphDependency.swift | 19 ++++++++----------- .../TargetDependency+GraphMapping.swift | 1 - 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/Package.resolved b/Package.resolved index 6289d813..03762c81 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "f98459e09386972f6e7eac37cf84e7db5eff69ccfdb6f67c5d5bfda323ca5778", + "originHash" : "461668ea15b2d23804514bc54f6825fc8833ec0ed643d855bb9a4583d5da508f", "pins" : [ { "identity" : "aexml", @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/tuist/FileSystem.git", "state" : { - "revision" : "42df856138ba27cc1ed59358a37b86e7ea31051e", - "version" : "0.12.3" + "revision" : "9b721b9ce9066476bd02770bd3bb448f85a1ea79", + "version" : "0.13.28" } }, { @@ -51,8 +51,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Kolos65/Mockable.git", "state" : { - "revision" : "ee133a696dce312da292b00d0944aafaa808eaca", - "version" : "0.4.0" + "revision" : "0a822d53fa7516abe659b44a9c508b8eb9b666bd", + "version" : "0.4.1" } }, { @@ -141,8 +141,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio", "state" : { - "revision" : "a18bddb0acf7a40d982b2f128ce73ce4ee31f352", - "version" : "2.86.2" + "revision" : "56724a2b6d8e2aed1b2c5f23865b9ea5c43f9977", + "version" : "2.89.0" } }, { @@ -177,8 +177,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "revision" : "39de59b2d47f7ef3ca88a039dff3084688fe27f4", - "version" : "1.5.2" + "revision" : "4c27acf5394b645b70d8ba19dc249c0472d5f618", + "version" : "1.7.0" } }, { diff --git a/Sources/XcodeGraph/Graph/GraphDependency.swift b/Sources/XcodeGraph/Graph/GraphDependency.swift index 35c514d9..40f35481 100644 --- a/Sources/XcodeGraph/Graph/GraphDependency.swift +++ b/Sources/XcodeGraph/Graph/GraphDependency.swift @@ -3,14 +3,14 @@ import Path public enum GraphDependency: Hashable, CustomStringConvertible, Comparable, Codable, Sendable { public struct XCFramework: Hashable, CustomStringConvertible, Comparable, Codable, Sendable { - public let path: AbsolutePath - public let infoPlist: XCFrameworkInfoPlist - public let linking: BinaryLinking - public let mergeable: Bool - public let status: LinkingStatus - public let swiftModules: [AbsolutePath] - public let moduleMaps: [AbsolutePath] - public let expectedSignature: String? + public var path: AbsolutePath + public var infoPlist: XCFrameworkInfoPlist + public var linking: BinaryLinking + public var mergeable: Bool + public var status: LinkingStatus + public var swiftModules: [AbsolutePath] + public var moduleMaps: [AbsolutePath] + public var expectedSignature: String? public init( path: AbsolutePath, @@ -18,7 +18,6 @@ public enum GraphDependency: Hashable, CustomStringConvertible, Comparable, Coda linking: BinaryLinking, mergeable: Bool, status: LinkingStatus, - macroPath _: AbsolutePath?, swiftModules: [AbsolutePath], moduleMaps: [AbsolutePath], expectedSignature: String? = nil @@ -327,7 +326,6 @@ public enum GraphDependency: Hashable, CustomStringConvertible, Comparable, Coda linking: BinaryLinking = .dynamic, mergeable: Bool = false, status: LinkingStatus = .required, - macroPath: AbsolutePath? = nil, swiftModules: [AbsolutePath] = [], moduleMaps: [AbsolutePath] = [] ) -> GraphDependency { @@ -338,7 +336,6 @@ public enum GraphDependency: Hashable, CustomStringConvertible, Comparable, Coda linking: linking, mergeable: mergeable, status: status, - macroPath: macroPath, swiftModules: swiftModules, moduleMaps: moduleMaps ) diff --git a/Sources/XcodeGraphMapper/Mappers/Targets/TargetDependency+GraphMapping.swift b/Sources/XcodeGraphMapper/Mappers/Targets/TargetDependency+GraphMapping.swift index adede7ef..a85e3ae6 100644 --- a/Sources/XcodeGraphMapper/Mappers/Targets/TargetDependency+GraphMapping.swift +++ b/Sources/XcodeGraphMapper/Mappers/Targets/TargetDependency+GraphMapping.swift @@ -64,7 +64,6 @@ extension TargetDependency { linking: metadata.linking, mergeable: metadata.mergeable, status: status, - macroPath: metadata.macroPath, swiftModules: metadata.swiftModules, moduleMaps: metadata.moduleMaps, expectedSignature: metadata.expectedSignature?.signatureString()