Skip to content

Commit

Permalink
chore(package-managers): Name the MavenSupport variable consistently
Browse files Browse the repository at this point in the history
Signed-off-by: Sebastian Schuberth <[email protected]>
  • Loading branch information
sschuberth committed Jan 20, 2025
1 parent 1ec2b63 commit f1c082b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions plugins/package-managers/gradle/src/main/kotlin/Gradle.kt
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ class Gradle(
override fun getRepository() = workspaceRepository
}

private val maven = MavenSupport(GradleCacheReader())
private val dependencyHandler = GradleDependencyHandler(managerName, projectType, maven)
private val mavenSupport = MavenSupport(GradleCacheReader())
private val dependencyHandler = GradleDependencyHandler(managerName, projectType, mavenSupport)
private val graphBuilder = DependencyGraphBuilder(dependencyHandler)

// The path to the root project. In a single-project, just points to the project path.
Expand Down Expand Up @@ -330,6 +330,6 @@ class Gradle(
}

override fun afterResolution(definitionFiles: List<File>) {
maven.close()
mavenSupport.close()
}
}
10 changes: 5 additions & 5 deletions plugins/package-managers/maven/src/main/kotlin/Maven.kt
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class Maven(
override fun getRepository() = workspaceRepository
}

private val mvn = MavenSupport(LocalProjectWorkspaceReader())
private val mavenSupport = MavenSupport(LocalProjectWorkspaceReader())

private val localProjectBuildingResults = mutableMapOf<String, ProjectBuildingResult>()

Expand All @@ -102,10 +102,10 @@ class Maven(
private val sbtMode = options["sbtMode"].toBoolean()

override fun beforeResolution(definitionFiles: List<File>) {
localProjectBuildingResults += mvn.prepareMavenProjects(definitionFiles)
localProjectBuildingResults += mavenSupport.prepareMavenProjects(definitionFiles)

val localProjects = localProjectBuildingResults.mapValues { it.value.project }
val dependencyHandler = MavenDependencyHandler(managerName, projectType, mvn, localProjects, sbtMode)
val dependencyHandler = MavenDependencyHandler(managerName, projectType, mavenSupport, localProjects, sbtMode)
graphBuilder = DependencyGraphBuilder(dependencyHandler)
}

Expand All @@ -114,7 +114,7 @@ class Maven(

override fun resolveDependencies(definitionFile: File, labels: Map<String, String>): List<ProjectAnalyzerResult> {
val workingDir = definitionFile.parentFile
val projectBuildingResult = mvn.buildMavenProject(definitionFile)
val projectBuildingResult = mavenSupport.buildMavenProject(definitionFile)
val mavenProject = projectBuildingResult.project
val projectId = Identifier(
type = projectType,
Expand Down Expand Up @@ -174,7 +174,7 @@ class Maven(
}

override fun afterResolution(definitionFiles: List<File>) {
mvn.close()
mavenSupport.close()
}
}

Expand Down

0 comments on commit f1c082b

Please sign in to comment.