Skip to content

Commit 06e5612

Browse files
author
ondrej.basler
committed
Resolve code review issues
1 parent 4a7eedc commit 06e5612

File tree

2 files changed

+30
-12
lines changed

2 files changed

+30
-12
lines changed
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4-
networkTimeout=10000
5-
validateDistributionUrl=true
64
zipStoreBase=GRADLE_USER_HOME
75
zipStorePath=wrapper/dists

src/main/kotlin/com/github/ivancarras/graphfity/plugin/task/GraphfityTask.kt

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,32 @@ abstract class GraphfityTask : DefaultTask() {
3434
val nodesLevel = HashMap<String, Int>()
3535
val dotFile = createDotFile(dotPath)
3636

37-
obtainNodesAndDependencies(rootProject, nodes, dependencies, nodeTypes)
38-
obtainNodesLevels(projectRootName, dependencies, nodesLevel)
39-
addNodesToFile(dotFile, nodes)
40-
addDependenciesToFile(dotFile, dependencies)
41-
addNodeLevelsToFile(dotFile, nodesLevel)
42-
generateGraph(dotFile)
37+
obtainNodesAndDependencies(
38+
project = rootProject,
39+
nodes = nodes,
40+
dependencies = dependencies,
41+
nodeTypes = nodeTypes
42+
)
43+
obtainNodesLevels(
44+
rootProjectName = projectRootName,
45+
dependencies = dependencies,
46+
nodeLevel = nodesLevel
47+
)
48+
addNodesToFile(
49+
dotFile = dotFile,
50+
nodes = nodes
51+
)
52+
addDependenciesToFile(
53+
dotFile = dotFile,
54+
dependencies = dependencies
55+
)
56+
addNodeLevelsToFile(
57+
dotFile = dotFile,
58+
nodeLevels = nodesLevel
59+
)
60+
generateGraph(
61+
dotFile = dotFile
62+
)
4363
}
4464

4565
private fun getRootProject(projectRootName: String): Project {
@@ -92,14 +112,14 @@ abstract class GraphfityTask : DefaultTask() {
92112

93113
private fun obtainNodesAndDependencies(
94114
project: Project,
95-
projects: HashSet<NodeData>,
115+
nodes: HashSet<NodeData>,
96116
dependencies: HashSet<Pair<NodeData, NodeData>>,
97117
nodeTypes: List<NodeType>,
98118
) {
99119
val projectNodeData = mapProjectToNode(project, nodeTypes)
100120

101121
if (projectNodeData != null && projectNodeData.nodeType.isEnabled) {
102-
projects.add(projectNodeData)
122+
nodes.add(projectNodeData)
103123
}
104124

105125
project.configurations.forEach { config ->
@@ -114,10 +134,10 @@ abstract class GraphfityTask : DefaultTask() {
114134
) {
115135
dependencies.add(Pair(projectNodeData, dependencyProjectNodeData))
116136

117-
if (dependencyProjectNodeData !in projects) {
137+
if (dependencyProjectNodeData !in nodes) {
118138
obtainNodesAndDependencies(
119139
project = dependencyProject,
120-
projects = projects,
140+
nodes = nodes,
121141
dependencies = dependencies,
122142
nodeTypes = nodeTypes,
123143
)

0 commit comments

Comments
 (0)