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

Gradle 7.0 compatibility #122

Merged
merged 1 commit into from
Apr 19, 2021
Merged

Gradle 7.0 compatibility #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions ...ain/kotlin/com/vanniktech/dependency/graph/generator/DependencyGraphGeneratorExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import org.gradle.api.Project
import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.ResolvedDependency
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.Optional

/**
Expand Down Expand Up @@ -61,7 +62,7 @@ open class DependencyGraphGeneratorExtension(project: Project) {
/** Allows to change the node for the given project. */
@get:Input var projectNode: (MutableNode, Project) -> MutableNode = { node, _ -> node },
/** Optional label that can be displayed wrapped around the graph. */
var label: Label? = null, //Not serializable making it unusable as an Input
@get:Internal var label: Label? = null, //Not serializable making it unusable as an Input
/** Return true when you want to include this configuration, false otherwise. */
@get:Input var includeConfiguration: (Configuration) -> Boolean = {
// By default we'll include everything that's on the compileClassPath except test, UnitTest and AndroidTest configurations.
Expand All @@ -76,9 +77,9 @@ open class DependencyGraphGeneratorExtension(project: Project) {
@get:Input var graph: (MutableGraph) -> MutableGraph = { it }
) {
/** Gradle task name that is associated with this generator. */
val gradleTaskName = "generateDependencyGraph${name.capitalize()}"
internal val outputFileName = "dependency-graph${name.toHyphenCase().nonEmptyPrepend("-")}"
internal val outputFileNameDot = "$outputFileName.dot"
@get:Internal val gradleTaskName = "generateDependencyGraph${name.capitalize()}"
@get:Internal internal val outputFileName = "dependency-graph${name.toHyphenCase().nonEmptyPrepend("-")}"
@get:Internal internal val outputFileNameDot = "$outputFileName.dot"

@get:[Optional Input] internal val rawLabel: String?
get() = label?.toString()
Expand Down Expand Up @@ -109,9 +110,9 @@ open class DependencyGraphGeneratorExtension(project: Project) {
@get:Input var graph: (MutableGraph) -> MutableGraph = { it }
) {
/** Gradle task name that is associated with this generator. */
val gradleTaskName = "generateProjectDependencyGraph${name.capitalize()}"
internal val outputFileName = "project-dependency-graph${name.toHyphenCase().nonEmptyPrepend("-")}"
internal val outputFileNameDot = "$outputFileName.dot"
@get:Internal val gradleTaskName = "generateProjectDependencyGraph${name.capitalize()}"
@get:Internal internal val outputFileName = "project-dependency-graph${name.toHyphenCase().nonEmptyPrepend("-")}"
@get:Internal internal val outputFileNameDot = "$outputFileName.dot"

companion object {
/** Default behavior which will include everything as is. */
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/com/vanniktech/dependency/graph/generator/DependencyGraphGeneratorTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import guru.nidi.graphviz.engine.Graphviz
import org.gradle.api.DefaultTask
import org.gradle.api.tasks.CacheableTask
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.Nested
import org.gradle.api.tasks.OutputDirectory
import org.gradle.api.tasks.TaskAction
Expand All @@ -15,7 +16,7 @@ import java.io.File

@OutputDirectory lateinit var outputDirectory: File

val graph by lazy {
@get:Internal val graph by lazy {
DependencyGraphGenerator(project, generator).generateGraph()
}

Expand Down
3 changes: 2 additions & 1 deletion ...n/kotlin/com/vanniktech/dependency/graph/generator/ProjectDependencyGraphGeneratorTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import guru.nidi.graphviz.engine.Graphviz
import org.gradle.api.DefaultTask
import org.gradle.api.tasks.CacheableTask
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.Nested
import org.gradle.api.tasks.OutputDirectory
import org.gradle.api.tasks.TaskAction
Expand All @@ -15,7 +16,7 @@ import java.io.File

@OutputDirectory lateinit var outputDirectory: File

val graph by lazy {
@get:Internal val graph by lazy {
ProjectDependencyGraphGenerator(project, projectGenerator).generateGraph()
}

Expand Down