Make SwiftSDK.merge function internal and fix line-length formatting

marcprux · marcprux · commit bf6ea45e3cb4 · 2025-06-24T08:38:25.000-04:00
diff --git a/Sources/PackageModel/SwiftSDKs/SwiftSDK.swift b/Sources/PackageModel/SwiftSDKs/SwiftSDK.swift
@@ -382,7 +382,10 @@ public struct SwiftSDK: Equatable {
             }
         }
 
-        public mutating func merge(with newConfiguration: PathsConfiguration<String>, relativeTo basePath: Path?) throws -> [String] where Path == Basics.AbsolutePath {
+        mutating func merge(
+            with newConfiguration: PathsConfiguration<String>,
+            relativeTo basePath: Path?
+        ) throws -> [String] where Path == Basics.AbsolutePath {
             var updatedProperties: [String] = []
             if let sdkRootPath = newConfiguration.sdkRootPath {
                 self.sdkRootPath = try AbsolutePath(validating: sdkRootPath, relativeTo: basePath)

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,10 @@ public struct SwiftSDK: Equatable {`
`382`	`382`	`}`
`383`	`383`	`}`
`384`	`384`
`385`		`- public mutating func merge(with newConfiguration: PathsConfiguration<String>, relativeTo basePath: Path?) throws -> [String] where Path == Basics.AbsolutePath {`
	`385`	`+ mutating func merge(`
	`386`	`+ with newConfiguration: PathsConfiguration<String>,`
	`387`	`+ relativeTo basePath: Path?`
	`388`	`+ ) throws -> [String] where Path == Basics.AbsolutePath {`
`386`	`389`	`var updatedProperties: [String] = []`
`387`	`390`	`if let sdkRootPath = newConfiguration.sdkRootPath {`
`388`	`391`	`self.sdkRootPath = try AbsolutePath(validating: sdkRootPath, relativeTo: basePath)`