Cleanup injected parameters

Author: SgtSilvio

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

@@ -12,13 +12,11 @@ import io.github.sgtsilvio.gradle.oci.mapping.OciImageMappingImpl
 import io.github.sgtsilvio.gradle.oci.platform.PlatformFilter
 import org.gradle.api.Action
 import org.gradle.api.Project
-import org.gradle.api.artifacts.ConfigurationContainer
 import org.gradle.api.file.ProjectLayout
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.plugins.jvm.JvmTestSuite
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderFactory
-import org.gradle.api.services.BuildServiceRegistry
 import org.gradle.api.tasks.TaskContainer
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.testing.Test
@@ -35,9 +33,7 @@ internal abstract class OciExtensionImpl @Inject constructor(
     private val objectFactory: ObjectFactory,
     private val taskContainer: TaskContainer,
     private val projectLayout: ProjectLayout,
-    buildServiceRegistry: BuildServiceRegistry,
     project: Project,
-    configurationContainer: ConfigurationContainer,
 ) : OciExtension {
 
     final override val registries = objectFactory.newInstance<OciRegistriesImpl>()
@@ -60,7 +56,7 @@ internal abstract class OciExtensionImpl @Inject constructor(
     init {
         // eagerly realize imageDefinitions because they register configurations and tasks
         imageDefinitions.all {}
-        setupProjectOciRegistries(buildServiceRegistry, project, configurationContainer, registries, imageMapping)
+        setupProjectOciRegistries(project, registries, imageMapping)
     }
 
     final override fun registries(configuration: Action<in OciRegistries>) = configuration.execute(registries)

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

@@ -17,7 +17,6 @@ import io.netty.channel.ChannelOption
 import io.netty.util.concurrent.FastThreadLocal
 import org.gradle.api.Action
 import org.gradle.api.Project
-import org.gradle.api.artifacts.ConfigurationContainer
 import org.gradle.api.artifacts.ResolvableDependencies
 import org.gradle.api.artifacts.dsl.RepositoryHandler
 import org.gradle.api.artifacts.repositories.InclusiveRepositoryContentDescriptor
@@ -52,8 +51,8 @@ internal val OCI_IMAGE_DISTRIBUTION_TYPES = arrayOf(OCI_IMAGE_DISTRIBUTION_TYPE,
  */
 internal abstract class OciRegistriesImpl @Inject constructor(
     private val repositoryHandler: RepositoryHandler,
-    private val objectFactory: ObjectFactory,
     private val providerFactory: ProviderFactory,
+    private val objectFactory: ObjectFactory,
 ) : OciRegistries {
     final override val list = objectFactory.namedDomainObjectList(OciRegistry::class)
     final override val repositoryPort: Property<Int> = objectFactory.property<Int>().convention(5123)
@@ -283,24 +282,18 @@ internal fun setupSettingsOciRegistries(
     )
 }
 
-internal fun setupProjectOciRegistries(
-    buildServiceRegistry: BuildServiceRegistry,
-    project: Project,
-    configurationContainer: ConfigurationContainer,
-    registries: OciRegistries,
-    imageMapping: OciImageMappingImpl,
-) {
+internal fun setupProjectOciRegistries(project: Project, registries: OciRegistries, imageMapping: OciImageMappingImpl) {
     var isOciRegistriesStarted = false
-    configurationContainer.configureEach {
+    project.configurations.configureEach {
         incoming.beforeResolve {
             if (!isOciRegistriesStarted && resolvesOciImages()) {
                 isOciRegistriesStarted = true
-                val settingsRegistration = buildServiceRegistry.registrations.findByName(SERVICE_BASE_NAME)
+                val settingsRegistration = project.gradle.sharedServices.registrations.findByName(SERVICE_BASE_NAME)
                 if (settingsRegistration != null) {
                     (settingsRegistration.service.get() as OciRegistriesService).start()
                 }
                 OciRegistriesService(
-                    buildServiceRegistry,
+                    project.gradle.sharedServices,
                     "$SERVICE_BASE_NAME-${project.path}",
                     registries.list,
                     registries.repositoryPort,

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

@@ -17,8 +17,8 @@ import javax.inject.Inject
  */
 internal abstract class OciSettingsExtensionImpl @Inject constructor(
     repositoryHandler: RepositoryHandler,
-    objectFactory: ObjectFactory,
     providerFactory: ProviderFactory,
+    objectFactory: ObjectFactory,
     buildServiceRegistry: BuildServiceRegistry,
 ) : OciSettingsExtension {