Skip to content

Commit 6076bf8

Browse files
committed
Move getRegistriesConfig to SwiftTool as internal declaration
1 parent 2d679da commit 6076bf8

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

Sources/Commands/SwiftPackageRegistryTool.swift

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -152,22 +152,3 @@ public struct SwiftPackageRegistryTool: ParsableCommand {
152152
}
153153
}
154154
}
155-
156-
// MARK: -
157-
158-
private extension SwiftTool {
159-
func getRegistriesConfig() throws -> Workspace.Configuration.Registries {
160-
let localRegistriesFile = try Workspace.DefaultLocations.registriesConfigurationFile(forRootPackage: self.getPackageRoot())
161-
162-
let workspace = try getActiveWorkspace()
163-
let sharedRegistriesFile = workspace.location.sharedConfigurationDirectory.map {
164-
Workspace.DefaultLocations.registriesConfigurationFile(at: $0)
165-
}
166-
167-
return try .init(
168-
localRegistriesFile: localRegistriesFile,
169-
sharedRegistriesFile: sharedRegistriesFile,
170-
fileSystem: localFileSystem
171-
)
172-
}
173-
}

Sources/Commands/SwiftTool.swift

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,21 @@ public class SwiftTool {
461461
return newPath
462462
}
463463

464+
func getRegistriesConfig() throws -> Workspace.Configuration.Registries {
465+
let localRegistriesFile = try Workspace.DefaultLocations.registriesConfigurationFile(forRootPackage: self.getPackageRoot())
466+
467+
let workspace = try getActiveWorkspace()
468+
let sharedRegistriesFile = workspace.location.sharedConfigurationDirectory.map {
469+
Workspace.DefaultLocations.registriesConfigurationFile(at: $0)
470+
}
471+
472+
return try .init(
473+
localRegistriesFile: localRegistriesFile,
474+
sharedRegistriesFile: sharedRegistriesFile,
475+
fileSystem: localFileSystem
476+
)
477+
}
478+
464479
func getAuthorizationProvider() throws -> AuthorizationProvider? {
465480
// currently only single provider: netrc
466481
return try self.getNetrcConfig()?.get()

0 commit comments

Comments
 (0)