Refactor OciImageDependencies: default methods for ProviderConvertible

SgtSilvio · Feb 26, 2024 · 703fbb5 · 703fbb5
1 parent 73ff7fc
commit 703fbb5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/dsl/OciImageDependencies.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/dsl/OciImageDependencies.kt
@@ -35,12 +35,13 @@ interface OciImageDependencies<T> {
 
     fun add(project: Project, action: Action<in ProjectDependency>): T
 
-    fun add(dependencyProvider: ProviderConvertible<out MinimalExternalModuleDependency>): T
+    fun add(dependencyProvider: ProviderConvertible<out MinimalExternalModuleDependency>) =
+        add(dependencyProvider.asProvider())
 
     fun add(
         dependencyProvider: ProviderConvertible<out MinimalExternalModuleDependency>,
         action: Action<in ExternalModuleDependency>,
-    ): T
+    ) = add(dependencyProvider.asProvider(), action)
 
     // add constraint
 
@@ -67,7 +68,8 @@ interface OciImageDependencies<T> {
 
     fun constraint(dependencyProvider: Provider<out MinimalExternalModuleDependency>): Provider<DependencyConstraint>
 
-    fun constraint(dependencyProvider: ProviderConvertible<out MinimalExternalModuleDependency>): Provider<DependencyConstraint>
+    fun constraint(dependencyProvider: ProviderConvertible<out MinimalExternalModuleDependency>) =
+        constraint(dependencyProvider.asProvider())
 
     // dsl syntactic sugar for adding dependency
 

diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/dsl/OciImageDependenciesImpl.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/dsl/OciImageDependenciesImpl.kt
@@ -6,7 +6,6 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.*
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.provider.Provider
-import org.gradle.api.provider.ProviderConvertible
 import org.gradle.kotlin.dsl.withType
 
 /**
@@ -74,14 +73,6 @@ internal abstract class OciImageDependenciesImpl<T>(
     final override fun add(project: Project, action: Action<in ProjectDependency>) =
         add(createDependency(project), action)
 
-    final override fun add(dependencyProvider: ProviderConvertible<out MinimalExternalModuleDependency>) =
-        add(dependencyProvider.asProvider())
-
-    final override fun add(
-        dependencyProvider: ProviderConvertible<out MinimalExternalModuleDependency>,
-        action: Action<in ExternalModuleDependency>,
-    ) = add(dependencyProvider.asProvider(), action)
-
     // add constraint
 
     final override fun add(dependencyConstraint: DependencyConstraint) {
@@ -118,7 +109,4 @@ internal abstract class OciImageDependenciesImpl<T>(
 
     final override fun constraint(dependencyProvider: Provider<out MinimalExternalModuleDependency>) =
         dependencyProvider.map { constraint(it) }
-
-    final override fun constraint(dependencyProvider: ProviderConvertible<out MinimalExternalModuleDependency>) =
-        constraint(dependencyProvider.asProvider())
 }