Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update graphviz-java to 0.18.1 #151

Merged
merged 10 commits into from
Jun 4, 2022
Merged

Update graphviz-java to 0.18.1 #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1b70f36
Update graphviz-java to 0.18.1
SimonMarquis Jun 4, 2022
fe159e1
Fix tests in DependencyGraphGeneratorTest.kt
SimonMarquis Jun 4, 2022
1e47ed7
Fix `DependencyGraphGeneratorPluginTest.multiProjectIntegrationTest()`
SimonMarquis Jun 4, 2022
6997531
Merge branch 'master' into path/graphviz
SimonMarquis Jun 4, 2022
6401946
Set max heap size of Gradle daemon to 2G
SimonMarquis Jun 4, 2022
d9466c1
Fix integrationTestGradle742 test
SimonMarquis Jun 4, 2022
9235955
Set max heap size of GradleRunner to 2G used in tests
SimonMarquis Jun 4, 2022
e4e72f6
Add `withDebug(true)` and `--stacktrace`
SimonMarquis Jun 4, 2022
849500b
Remove "Times New Roman" font
SimonMarquis Jun 4, 2022
37d21d0
Set max heap size of Gradle daemon to 2g for all test tasks
SimonMarquis Jun 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ repositories {
dependencies {
implementation localGroovy()
implementation gradleApi()
api "guru.nidi:graphviz-java:0.8.1"
api "guru.nidi:graphviz-java:0.18.1"

testImplementation 'junit:junit:4.13.2'
testImplementation "com.android.tools.build:gradle:7.0.4"
Expand All @@ -90,4 +90,5 @@ test {
testLogging {
exceptionFormat "full"
}
jvmArgs("-Xmx2048m")
}
4 changes: 3 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo

POM_DEVELOPER_ID=vanniktech
POM_DEVELOPER_NAME=Niklas Baudy
POM_DEVELOPER_NAME=Niklas Baudy

org.gradle.jvmargs=-Xmx2048m
6 changes: 2 additions & 4 deletions src/main/kotlin/com/vanniktech/dependency/graph/generator/DependencyGraphGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.vanniktech.dependency.graph.generator

import com.vanniktech.dependency.graph.generator.DependencyGraphGeneratorExtension.Generator
import guru.nidi.graphviz.attribute.Font
import guru.nidi.graphviz.attribute.Label
import guru.nidi.graphviz.attribute.Rank
import guru.nidi.graphviz.attribute.Rank.RankType
import guru.nidi.graphviz.attribute.Shape
import guru.nidi.graphviz.model.Factory.graph
import guru.nidi.graphviz.model.Factory.mutGraph
Expand Down Expand Up @@ -31,8 +31,6 @@ internal class DependencyGraphGenerator(
graph.graphAttrs().add(it)
}

graph.nodeAttrs().add(Font.name("Times New Roman"))

val projects = (if (project.subprojects.size > 0) project.subprojects else setOf(project))
.filter { generator.includeProject(it) }

Expand Down Expand Up @@ -67,7 +65,7 @@ internal class DependencyGraphGenerator(
graph.add(
graph()
.graphAttr()
.with(Rank.SAME)
.with(Rank.inSubgraph(RankType.SAME))
.with(*rootNodes.map { mutNode(it) }.toTypedArray())
)
}
Expand Down
5 changes: 3 additions & 2 deletions src/main/kotlin/com/vanniktech/dependency/graph/generator/ProjectDependencyGraphGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import guru.nidi.graphviz.attribute.Color
import guru.nidi.graphviz.attribute.Font
import guru.nidi.graphviz.attribute.Label
import guru.nidi.graphviz.attribute.Rank
import guru.nidi.graphviz.attribute.Rank.RankType
import guru.nidi.graphviz.attribute.Shape
import guru.nidi.graphviz.attribute.Style
import guru.nidi.graphviz.model.Factory.graph
Expand Down Expand Up @@ -40,7 +41,7 @@ internal class ProjectDependencyGraphGenerator(

val graph = mutGraph().setDirected(true)
graph.graphAttrs().add(Label.of(project.name).locate(Label.Location.TOP), Font.size(DEFAULT_FONT_SIZE))
graph.nodeAttrs().add(Font.name("Times New Roman"), Style.FILLED)
graph.nodeAttrs().add(Style.FILLED)
projects.forEach { addNode(it, dependencies, graph) }
rankRootProjects(graph, projects, dependencies)
addDependencies(dependencies, graph)
Expand Down Expand Up @@ -72,7 +73,7 @@ internal class ProjectDependencyGraphGenerator(
graph.add(
graph()
.graphAttr()
.with(Rank.SAME)
.with(Rank.inSubgraph(RankType.SAME))
.with(*projects.filter { project -> dependencies.none { it.to == project } }.map { mutNode(it.path) }.toTypedArray())
)
}
Expand Down
56 changes: 31 additions & 25 deletions ...test/java/com/vanniktech/dependency/graph/generator/DependencyGraphGeneratorPluginTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ class DependencyGraphGeneratorPluginTest {
)

fun runBuild(): BuildResult {
return GradleRunner.create()
return GradleRunner.create().withDebug(true)
.withPluginClasspath()
.withGradleVersion(gradleVersion)
.withProjectDir(testProjectDir.root)
.withArguments("generateDependencyGraph", "generateProjectDependencyGraph")
.withArguments("generateDependencyGraph", "generateProjectDependencyGraph", "-Dorg.gradle.jvmargs=-Xmx2048m", "--stacktrace")
.build()
}

Expand All @@ -96,13 +96,14 @@ class DependencyGraphGeneratorPluginTest {
assertEquals(
"""
digraph "G" {
node ["fontname"="Times New Roman"]
"${testProjectDir.root.name}" ["shape"="rectangle","label"="${testProjectDir.root.name}"]
"orgjetbrainskotlinkotlinstdlib" ["shape"="rectangle","label"="kotlin-stdlib"]
"orgjetbrainsannotations" ["shape"="rectangle","label"="jetbrains-annotations"]
"ioreactivexrxjava2rxjava" ["shape"="rectangle","label"="rxjava"]
"orgreactivestreamsreactivestreams" ["shape"="rectangle","label"="reactive-streams"]
edge ["dir"="forward"]
"${testProjectDir.root.name}" ["label"="${testProjectDir.root.name}","shape"="rectangle"]
"orgjetbrainskotlinkotlinstdlib" ["label"="kotlin-stdlib","shape"="rectangle"]
"orgjetbrainsannotations" ["label"="jetbrains-annotations","shape"="rectangle"]
"ioreactivexrxjava2rxjava" ["label"="rxjava","shape"="rectangle"]
"orgreactivestreamsreactivestreams" ["label"="reactive-streams","shape"="rectangle"]
{
edge ["dir"="none"]
graph ["rank"="same"]
"${testProjectDir.root.name}"
}
Expand All @@ -122,9 +123,11 @@ class DependencyGraphGeneratorPluginTest {
assertEquals(
"""
digraph {
graph ["fontsize"="35","label"="${testProjectDir.root.name}","labelloc"="t"]
node ["fontname"="Times New Roman","style"="filled"]
edge ["dir"="forward"]
graph ["label"="${testProjectDir.root.name}","labelloc"="t","fontsize"="35"]
node ["style"="filled"]
{
edge ["dir"="none"]
graph ["rank"="same"]
}
}
Expand Down Expand Up @@ -244,11 +247,11 @@ class DependencyGraphGeneratorPluginTest {

val empty = testProjectDir.newFolder("empty").run { parentFile.name + name }

val result = GradleRunner.create()
val result = GradleRunner.create().withDebug(true)
.withPluginClasspath()
.withGradleVersion("7.4.2")
.withProjectDir(testProjectDir.root)
.withArguments("generateDependencyGraph", "generateProjectDependencyGraph", "app:generateProjectDependencyGraph")
.withArguments("generateDependencyGraph", "generateProjectDependencyGraph", "app:generateProjectDependencyGraph", "-Dorg.gradle.jvmargs=-Xmx2048m", "--stacktrace")
.build()

result.tasks.filter { it.path.contains("DependencyGraph") }.forEach {
Expand All @@ -261,17 +264,18 @@ class DependencyGraphGeneratorPluginTest {
assertEquals(
"""
digraph "G" {
node ["fontname"="Times New Roman"]
"$app" ["shape"="rectangle","label"="app"]
"$lib1" ["shape"="rectangle","label"="lib1"]
"$lib" ["shape"="rectangle","label"="lib"]
"ioreactivexrxjava2rxjava" ["shape"="rectangle","label"="rxjava"]
"orgreactivestreamsreactivestreams" ["shape"="rectangle","label"="reactive-streams"]
"orgjetbrainskotlinkotlinstdlib" ["shape"="rectangle","label"="kotlin-stdlib"]
"orgjetbrainsannotations" ["shape"="rectangle","label"="jetbrains-annotations"]
"$lib2" ["shape"="rectangle","label"="lib2"]
"$empty" ["shape"="rectangle","label"="empty"]
edge ["dir"="forward"]
"$app" ["label"="app","shape"="rectangle"]
"$lib1" ["label"="lib1","shape"="rectangle"]
"$lib" ["label"="lib","shape"="rectangle"]
"ioreactivexrxjava2rxjava" ["label"="rxjava","shape"="rectangle"]
"orgreactivestreamsreactivestreams" ["label"="reactive-streams","shape"="rectangle"]
"orgjetbrainskotlinkotlinstdlib" ["label"="kotlin-stdlib","shape"="rectangle"]
"orgjetbrainsannotations" ["label"="jetbrains-annotations","shape"="rectangle"]
"$lib2" ["label"="lib2","shape"="rectangle"]
"$empty" ["label"="empty","shape"="rectangle"]
{
edge ["dir"="none"]
graph ["rank"="same"]
"$app"
"$empty"
Expand All @@ -294,13 +298,15 @@ class DependencyGraphGeneratorPluginTest {

fun projectDependencyGraph(label: String) = """
digraph {
graph ["fontsize"="35","label"="$label","labelloc"="t"]
node ["fontname"="Times New Roman","style"="filled"]
":app" ["fillcolor"="#ff8a65","shape"="rectangle"]
edge ["dir"="forward"]
graph ["label"="$label","labelloc"="t","fontsize"="35"]
node ["style"="filled"]
":app" ["shape"="rectangle","fillcolor"="#ff8a65"]
":lib1" ["fillcolor"="#ff8a65"]
":lib" ["fillcolor"="#ff8a65"]
":lib2" ["fillcolor"="#ff8a65"]
{
edge ["dir"="none"]
graph ["rank"="same"]
":app"
}
Expand Down
Loading