Skip to content

Commit 94c5357

Browse files
committed
Cosmetic improvements to Simple resolution report
1 parent 9945b32 commit 94c5357

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

plugin/src/main/kotlin/org/gradle/dependencygraph/extractor/DependencyExtractor.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,9 @@ abstract class DependencyExtractor :
194194
configurationName: String
195195
): DependencyScope {
196196
if (configurationFilter.scopesAreConfigured()) {
197-
return if (configurationFilter.isRuntime(rootPath, configurationName)) RUNTIME else DEVELOPMENT
197+
return if (configurationFilter.isRuntime(rootPath, configurationName)) Runtime else Development
198198
}
199-
return UNKNOWN
199+
return Unknown
200200
}
201201

202202
private fun walkComponentDependencies(

plugin/src/main/kotlin/org/gradle/dependencygraph/model/DependencyScope.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ package org.gradle.dependencygraph.model
66
* Later development may extend this to a richer set of scopes.
77
*/
88
enum class DependencyScope {
9-
UNKNOWN, DEVELOPMENT, RUNTIME;
9+
Unknown, Development, Runtime;
1010

1111
companion object {
1212
fun getEffectiveScope(scopes: List<DependencyScope>): DependencyScope {
13-
if (scopes.contains(RUNTIME)) return RUNTIME
14-
if (scopes.contains(DEVELOPMENT)) return DEVELOPMENT
15-
return UNKNOWN
13+
if (scopes.contains(Runtime)) return Runtime
14+
if (scopes.contains(Development)) return Development
15+
return Unknown
1616
}
1717
}
1818
}

plugin/src/main/kotlin/org/gradle/dependencygraph/simple/SimpleDependencyGraphRenderer.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ class SimpleDependencyGraphRenderer : DependencyGraphRenderer {
4040
outputDirectory: File,
4141
resolvedConfigurations: List<ResolvedConfiguration>
4242
) {
43-
val outputFile = File(outputDirectory, "dependency-scopes.json")
43+
val outputFile = File(outputDirectory, "dependency-resolution.json")
4444
val dependencyList: MutableMap<String, MutableSet<SimpleDependencyResolution>> = mutableMapOf()
4545
for (config in resolvedConfigurations) {
4646
for (dependency in config.allDependencies) {
4747
if (dependency.isProject) continue
4848

49-
val dependencyScopes = dependencyList.getOrPut(dependency.id) { mutableSetOf() }
50-
dependencyScopes.add(
49+
val dependencyResolutions = dependencyList.getOrPut(dependency.id) { mutableSetOf() }
50+
dependencyResolutions.add(
5151
SimpleDependencyResolution(
5252
config.rootOrigin.path,
5353
config.configurationName,

plugin/src/main/kotlin/org/gradle/github/dependencygraph/GitHubRepositorySnapshotBuilder.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ class GitHubRepositorySnapshotBuilder(
4040

4141
private fun determineGitHubScope(configuration: ResolvedConfiguration): GitHubDependency.Scope? {
4242
return when(configuration.scope) {
43-
DependencyScope.DEVELOPMENT -> GitHubDependency.Scope.development
44-
DependencyScope.RUNTIME -> GitHubDependency.Scope.runtime
45-
DependencyScope.UNKNOWN -> null
43+
DependencyScope.Development -> GitHubDependency.Scope.development
44+
DependencyScope.Runtime -> GitHubDependency.Scope.runtime
45+
DependencyScope.Unknown -> null
4646
}
4747
}
4848

0 commit comments

Comments
 (0)