Skip to content

Commit 6a126ec

Browse files
committed
Update naming convention
1 parent 7bf0de7 commit 6a126ec

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

Sources/SwiftJavaTool/Commands/ResolveCommand.swift

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,19 @@ extension SwiftJava.ResolveCommand {
7575
return
7676
}
7777

78-
var repositoriesToResolve: [JavaRepositoryDescriptor] = []
78+
var configuredRepositories: [JavaRepositoryDescriptor] = []
7979

8080
if let repositories = config.repositories {
81-
repositoriesToResolve += repositories
81+
configuredRepositories += repositories
8282
}
8383

84-
if !repositoriesToResolve.contains(where: { $0.type == .mavenCentral }) {
84+
if !configuredRepositories.contains(where: { $0.type == .mavenCentral }) {
8585
// swift-java dependencies are originally located in mavenCentral
86-
repositoriesToResolve.append(JavaRepositoryDescriptor(type: .mavenCentral))
86+
configuredRepositories.append(JavaRepositoryDescriptor(type: .mavenCentral))
8787
}
8888

8989
let dependenciesClasspath =
90-
try await resolveDependencies(swiftModule: swiftModule, dependencies: dependenciesToResolve, repositories: repositoriesToResolve)
90+
try await resolveDependencies(swiftModule: swiftModule, dependencies: dependenciesToResolve, repositories: configuredRepositories)
9191

9292
// FIXME: disentangle the output directory from SwiftJava and then make it a required option in this Command
9393
guard let outputDirectory = self.commonOptions.outputDirectory else {
@@ -102,11 +102,12 @@ extension SwiftJava.ResolveCommand {
102102

103103

104104
/// Resolves Java dependencies from swift-java.config and returns classpath information.
105-
///
105+
///
106106
/// - Parameters:
107107
/// - swiftModule: module name from --swift-module. e.g.: --swift-module MySwiftModule
108108
/// - dependencies: parsed maven-style dependency descriptors (groupId:artifactId:version)
109109
/// from Sources/MySwiftModule/swift-java.config "dependencies" array.
110+
/// - repositories: repositories used to resolve dependencies
110111
///
111112
/// - Throws:
112113
func resolveDependencies(
@@ -133,7 +134,7 @@ extension SwiftJava.ResolveCommand {
133134
/// Resolves maven-style dependencies from swift-java.config under temporary project directory.
134135
///
135136
/// - Parameter dependencies: maven-style dependencies to resolve
136-
/// - Parameter repositories: maven-style repositories to resolve
137+
/// - Parameter repositories: repositories used to resolve dependencies
137138
/// - Returns: Colon-separated classpath
138139
func resolveDependencies(dependencies: [JavaDependencyDescriptor], repositories: [JavaRepositoryDescriptor]) async -> String {
139140
let workDir = URL(fileURLWithPath: FileManager.default.currentDirectoryPath)

0 commit comments

Comments
 (0)