Add module(String) dependency factory to align with gradle dependencies block

Author: SgtSilvio

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

@@ -1,6 +1,7 @@
 package io.github.sgtsilvio.gradle.oci.dsl
 
 import org.gradle.api.artifacts.DependencyConstraint
+import org.gradle.api.artifacts.ExternalModuleDependency
 import org.gradle.api.artifacts.MinimalExternalModuleDependency
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.provider.Provider
@@ -11,6 +12,8 @@ import org.gradle.api.provider.ProviderConvertible
  */
 interface DependencyFactories {
 
+    fun module(dependencyNotation: CharSequence): ExternalModuleDependency
+
     fun project(): ProjectDependency
 
     fun project(projectPath: String): ProjectDependency

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

@@ -16,6 +16,8 @@ abstract class DependencyFactoriesImpl(
     private val project: Project,
 ) : DependencyFactories, DependencyConstraintFactories {
 
+    final override fun module(dependencyNotation: CharSequence) = project.dependencyFactory.create(dependencyNotation)
+
     final override fun project() = project.createProjectDependency()
 
     final override fun project(projectPath: String) = project.createProjectDependency(projectPath)

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

@@ -5,6 +5,7 @@ import org.gradle.api.Action
 import org.gradle.api.artifacts.DependencyConstraint
 import org.gradle.api.artifacts.ExternalModuleDependency
 import org.gradle.api.artifacts.ModuleDependency
+import org.gradle.api.artifacts.dsl.DependencyFactory
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Provider
@@ -14,8 +15,9 @@ import org.gradle.kotlin.dsl.setProperty
  * @author Silvio Giebl
  */
 internal abstract class OciImageDependencyCollectorBaseImpl<T>(
-    private val dependencyHandler: DependencyHandler,
     objectFactory: ObjectFactory,
+    private val dependencyFactory: DependencyFactory,
+    private val dependencyHandler: DependencyHandler,
 ) : OciImageDependencyCollectorBase<T> {
 
     final override val dependencies = objectFactory.setProperty<ModuleDependency>()
@@ -50,13 +52,10 @@ internal abstract class OciImageDependencyCollectorBaseImpl<T>(
 
     // add dependency converted from a different notation
 
-    private fun module(dependencyNotation: CharSequence) =
-        dependencyHandler.create(dependencyNotation) as ExternalModuleDependency
-
-    final override fun add(dependencyNotation: CharSequence) = add(module(dependencyNotation))
+    final override fun add(dependencyNotation: CharSequence) = add(dependencyFactory.create(dependencyNotation))
 
     final override fun add(dependencyNotation: CharSequence, action: Action<in ExternalModuleDependency>) =
-        add(module(dependencyNotation), action)
+        add(dependencyFactory.create(dependencyNotation), action)
 
     // add constraint
 

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

@@ -8,6 +8,7 @@ import io.github.sgtsilvio.gradle.oci.internal.gradle.attribute
 import io.github.sgtsilvio.gradle.oci.internal.gradle.zipAbsentAsNull
 import io.github.sgtsilvio.gradle.oci.metadata.OciImageReferenceSpec
 import org.gradle.api.artifacts.ModuleDependency
+import org.gradle.api.artifacts.dsl.DependencyFactory
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Provider
@@ -20,8 +21,10 @@ import javax.inject.Inject
  */
 internal abstract class OciImageDependencyCollectorImpl @Inject constructor(
     private val objectFactory: ObjectFactory,
+    dependencyFactory: DependencyFactory,
     dependencyHandler: DependencyHandler,
-) : OciImageDependencyCollectorBaseImpl<Nameable>(dependencyHandler, objectFactory), OciImageDependencyCollector {
+) : OciImageDependencyCollectorBaseImpl<Nameable>(objectFactory, dependencyFactory, dependencyHandler),
+    OciImageDependencyCollector {
 
     final override fun addInternal(dependency: ModuleDependency): ReferenceSpecsBuilder {
         val referenceSpecsBuilder = ReferenceSpecsBuilder(objectFactory)

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

@@ -2,6 +2,7 @@ package io.github.sgtsilvio.gradle.oci.internal.dsl
 
 import io.github.sgtsilvio.gradle.oci.dsl.ParentOciImageDependencyCollector
 import org.gradle.api.artifacts.ModuleDependency
+import org.gradle.api.artifacts.dsl.DependencyFactory
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Provider
@@ -11,9 +12,11 @@ import javax.inject.Inject
  * @author Silvio Giebl
  */
 internal abstract class ParentOciImageDependencyCollectorImpl @Inject constructor(
-    dependencyHandler: DependencyHandler,
     objectFactory: ObjectFactory,
-) : OciImageDependencyCollectorBaseImpl<Unit>(dependencyHandler, objectFactory), ParentOciImageDependencyCollector {
+    dependencyFactory: DependencyFactory,
+    dependencyHandler: DependencyHandler,
+) : OciImageDependencyCollectorBaseImpl<Unit>(objectFactory, dependencyFactory, dependencyHandler),
+    ParentOciImageDependencyCollector {
 
     final override fun addInternal(dependency: ModuleDependency) = dependencies.add(dependency)