Skip to content

Commit af08e03

Browse files
authored
Merge pull request #100 from sschuberth/address-inspection-hints
Address inspection hints
2 parents 4969b72 + 3dec09e commit af08e03

File tree

7 files changed

+6
-11
lines changed

7 files changed

+6
-11
lines changed

plugin/src/main/kotlin/org/gradle/dependencygraph/AbstractDependencyExtractorPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ abstract class AbstractDependencyExtractorPlugin : Plugin<Gradle> {
2020
*/
2121
abstract fun getRendererClassName(): String
2222

23-
internal lateinit var dependencyExtractorProvider: Provider<out DependencyExtractor>
23+
private lateinit var dependencyExtractorProvider: Provider<out DependencyExtractor>
2424

2525
override fun apply(gradle: Gradle) {
2626
val gradleVersion = GradleVersion.current()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ abstract class DependencyExtractor :
156156
val rootPath = projectIdentityPath ?: details.buildPath
157157

158158
if (!configurationFilter.include(rootPath, details.configurationName)) {
159-
LOGGER.debug("Ignoring resolved configuration: ${rootPath} - ${details.configurationName}")
159+
LOGGER.debug("Ignoring resolved configuration: $rootPath - ${details.configurationName}")
160160
return
161161
}
162162

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.gradle.dependencygraph.extractor
22

33
class ResolvedConfigurationFilter(projectFilter: String?, configurationFilter: String?) {
4-
val projectRegex = projectFilter?.toRegex()
5-
val configurationRegex = configurationFilter?.toRegex()
4+
private val projectRegex = projectFilter?.toRegex()
5+
private val configurationRegex = configurationFilter?.toRegex()
66

77
fun include(projectPath: String, configurationName: String): Boolean {
88
if (projectRegex != null && !projectRegex.matches(projectPath)) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import org.gradle.api.Plugin
44
import org.gradle.api.invocation.Gradle
55
import org.gradle.dependencygraph.AbstractDependencyExtractorPlugin
66
import org.gradle.forceresolve.ForceDependencyResolutionPlugin
7-
import org.gradle.github.GitHubDependencyExtractorPlugin
87

98
@Suppress("unused")
109
class SimpleDependencyGraphPlugin : Plugin<Gradle> {

plugin/src/main/kotlin/org/gradle/dependencygraph/util/GradleExtensions.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ import org.gradle.api.provider.ProviderFactory
77
import org.gradle.internal.operations.BuildOperationListenerManager
88

99
internal abstract class GradleExtensions {
10-
11-
inline val Gradle.objectFactory: ObjectFactory
12-
get() = service()
13-
1410
inline val Gradle.providerFactory: ProviderFactory
1511
get() = service()
1612

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.gradle.dependencygraph.model.ResolvedConfiguration
88
import org.gradle.dependencygraph.util.*
99
import java.io.File
1010

11-
class GitHubDependencyGraphRenderer() : DependencyGraphRenderer {
11+
class GitHubDependencyGraphRenderer : DependencyGraphRenderer {
1212

1313
override fun outputDependencyGraph(
1414
pluginParameters: PluginParameters,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const val PARAM_GITHUB_SHA = "GITHUB_DEPENDENCY_GRAPH_SHA"
1414
*/
1515
const val PARAM_GITHUB_WORKSPACE = "GITHUB_DEPENDENCY_GRAPH_WORKSPACE"
1616

17-
class GitHubSnapshotParams(private val pluginParameters: PluginParameters) {
17+
class GitHubSnapshotParams(pluginParameters: PluginParameters) {
1818
val dependencyGraphJobCorrelator: String = pluginParameters.load(PARAM_JOB_CORRELATOR)
1919
val dependencyGraphJobId: String =pluginParameters.load(PARAM_JOB_ID)
2020
val gitSha: String = pluginParameters.load(PARAM_GITHUB_SHA)

0 commit comments

Comments
 (0)