Skip to content

Commit 4011821

Browse files
committed
Improve createProjectDependency factory functions
1 parent 55ae603 commit 4011821

4 files changed

Lines changed: 9 additions & 16 deletions

File tree

src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/dsl/DependencyFactoriesImpl.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,27 @@ import org.gradle.api.Project
77
import org.gradle.api.artifacts.DependencyConstraint
88
import org.gradle.api.artifacts.MinimalExternalModuleDependency
99
import org.gradle.api.artifacts.ProjectDependency
10-
import org.gradle.api.artifacts.dsl.DependencyHandler
1110
import org.gradle.api.provider.Provider
1211

1312
/**
1413
* @author Silvio Giebl
1514
*/
1615
abstract class DependencyFactoriesImpl(
1716
private val project: Project,
18-
private val dependencyHandler: DependencyHandler,
1917
) : DependencyFactories, DependencyConstraintFactories {
2018

2119
final override fun project() = project.createProjectDependency()
2220

23-
final override fun project(projectPath: String) = dependencyHandler.createProjectDependency(projectPath)
21+
final override fun project(projectPath: String) = project.createProjectDependency(projectPath)
2422

2523
final override fun constraint(dependencyConstraintNotation: CharSequence): DependencyConstraint =
26-
dependencyHandler.constraints.create(dependencyConstraintNotation)
24+
project.dependencies.constraints.create(dependencyConstraintNotation)
2725

2826
final override fun constraint(projectDependency: ProjectDependency): DependencyConstraint =
29-
dependencyHandler.constraints.create(projectDependency)
27+
project.dependencies.constraints.create(projectDependency)
3028

3129
private fun constraint(dependency: MinimalExternalModuleDependency): DependencyConstraint =
32-
dependencyHandler.constraints.create(dependency)
30+
project.dependencies.constraints.create(dependency)
3331

3432
final override fun constraint(
3533
dependencyProvider: Provider<out MinimalExternalModuleDependency>,

src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/dsl/OciImageDependenciesImpl.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import org.gradle.api.artifacts.Configuration
1212
import org.gradle.api.artifacts.ConfigurationContainer
1313
import org.gradle.api.artifacts.ModuleDependency
1414
import org.gradle.api.artifacts.ResolvableDependencies
15-
import org.gradle.api.artifacts.dsl.DependencyHandler
1615
import org.gradle.api.attributes.Bundling
1716
import org.gradle.api.attributes.Category
1817
import org.gradle.api.model.ObjectFactory
@@ -31,8 +30,7 @@ internal abstract class OciImageDependenciesImpl @Inject constructor(
3130
private val providerFactory: ProviderFactory,
3231
private val configurationContainer: ConfigurationContainer,
3332
project: Project,
34-
dependencyHandler: DependencyHandler,
35-
) : DependencyFactoriesImpl(project, dependencyHandler), OciImageDependencies {
33+
) : DependencyFactoriesImpl(project), OciImageDependencies {
3634

3735
final override fun getName() = name
3836

src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/dsl/ParentOciImageDependenciesImpl.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import io.github.sgtsilvio.gradle.oci.platform.Platform
1111
import org.gradle.api.Project
1212
import org.gradle.api.artifacts.Configuration
1313
import org.gradle.api.artifacts.ConfigurationContainer
14-
import org.gradle.api.artifacts.dsl.DependencyHandler
1514
import org.gradle.api.attributes.Bundling
1615
import org.gradle.api.attributes.Category
1716
import org.gradle.api.model.ObjectFactory
@@ -28,8 +27,7 @@ internal abstract class ParentOciImageDependenciesImpl @Inject constructor(
2827
private val objectFactory: ObjectFactory,
2928
private val configurationContainer: ConfigurationContainer,
3029
project: Project,
31-
dependencyHandler: DependencyHandler,
32-
) : DependencyFactoriesImpl(project, dependencyHandler), ParentOciImageDependencies {
30+
) : DependencyFactoriesImpl(project), ParentOciImageDependencies {
3331

3432
final override fun getName() = name
3533

src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/gradle/DependencyExtensions.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ package io.github.sgtsilvio.gradle.oci.internal.gradle
33
import org.gradle.api.Project
44
import org.gradle.api.artifacts.ModuleDependency
55
import org.gradle.api.artifacts.ProjectDependency
6-
import org.gradle.api.artifacts.dsl.DependencyHandler
76
import org.gradle.api.attributes.Attribute
87

9-
internal fun Project.createProjectDependency() = project.dependencies.createProjectDependency(project.path)
8+
internal fun Project.createProjectDependency() = createProjectDependency(project.path)
109

11-
internal fun DependencyHandler.createProjectDependency(projectPath: String) =
12-
project(mapOf("path" to projectPath)) as ProjectDependency
10+
internal fun Project.createProjectDependency(projectPath: String) =
11+
dependencies.project(mapOf("path" to projectPath)) as ProjectDependency
1312

1413
internal fun <T : ModuleDependency, A : Any> T.attribute(key: Attribute<A>, value: A): T {
1514
attributes {

0 commit comments

Comments
 (0)