Move to managed property

gradle-nexus · Jul 13, 2023 · e964697 · e964697
1 parent 777dbde
commit e964697
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/src/main/kotlin/io/github/gradlenexus/publishplugin/FindStagingRepository.kt b/src/main/kotlin/io/github/gradlenexus/publishplugin/FindStagingRepository.kt
@@ -21,17 +21,16 @@ import io.github.gradlenexus.publishplugin.internal.NexusClient
 import org.gradle.api.GradleException
 import org.gradle.api.Incubating
 import org.gradle.api.provider.Property
-import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.TaskAction
-import javax.inject.Inject
 
 @Incubating
-abstract class FindStagingRepository @Inject constructor(
-    private val registry: Provider<InvalidatingStagingRepositoryDescriptorRegistry>
-) : AbstractNexusStagingRepositoryTask() {
+abstract class FindStagingRepository : AbstractNexusStagingRepositoryTask() {
+
+    @get:Internal
+    abstract val registry: Property<InvalidatingStagingRepositoryDescriptorRegistry>
 
     @get:Optional
     @get:Input

diff --git a/src/main/kotlin/io/github/gradlenexus/publishplugin/InitializeNexusStagingRepository.kt b/src/main/kotlin/io/github/gradlenexus/publishplugin/InitializeNexusStagingRepository.kt
@@ -21,15 +21,15 @@ import io.github.gradlenexus.publishplugin.internal.NexusClient
 import okhttp3.HttpUrl
 import org.gradle.api.GradleException
 import org.gradle.api.provider.Property
-import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.TaskAction
-import javax.inject.Inject
 
-abstract class InitializeNexusStagingRepository @Inject constructor(
-    private val registry: Provider<InvalidatingStagingRepositoryDescriptorRegistry>
-) : AbstractNexusStagingRepositoryTask() {
+abstract class InitializeNexusStagingRepository : AbstractNexusStagingRepositoryTask() {
+
+    @get:Internal
+    abstract val registry: Property<InvalidatingStagingRepositoryDescriptorRegistry>
 
     @get:Optional
     @get:Input

diff --git a/src/main/kotlin/io/github/gradlenexus/publishplugin/NexusPublishPlugin.kt b/src/main/kotlin/io/github/gradlenexus/publishplugin/NexusPublishPlugin.kt
@@ -136,7 +136,7 @@ class NexusPublishPlugin : Plugin<Project> {
         tasks: TaskContainer,
         extension: NexusPublishExtension,
         repo: NexusRepository,
-        registry: Provider<InvalidatingStagingRepositoryDescriptorRegistry>
+        registryProvider: Provider<InvalidatingStagingRepositoryDescriptorRegistry>
     ) {
         @Suppress("UNUSED_VARIABLE") // Keep it consistent.
         val retrieveStagingProfileTask = tasks.register<RetrieveStagingProfile>(
@@ -150,22 +150,20 @@ class NexusPublishPlugin : Plugin<Project> {
             packageGroup.convention(extension.packageGroup)
         }
         val initializeTask = tasks.register<InitializeNexusStagingRepository>(
-            "initialize${repo.capitalizedName}StagingRepository",
-            registry
-        )
-        initializeTask {
+            "initialize${repo.capitalizedName}StagingRepository"
+        ) {
             group = PublishingPlugin.PUBLISH_TASK_GROUP
             description = "Initializes the staging repository in '${repo.name}' Nexus instance."
+            registry.set(registryProvider)
             repository.convention(repo)
             packageGroup.convention(extension.packageGroup)
         }
         val findStagingRepository = tasks.register<FindStagingRepository>(
-            "find${repo.capitalizedName}StagingRepository",
-            registry
-        )
-        findStagingRepository {
+            "find${repo.capitalizedName}StagingRepository"
+        ) {
             group = PublishingPlugin.PUBLISH_TASK_GROUP
             description = "Finds the staging repository for ${repo.name}"
+            registry.set(registryProvider)
             repository.convention(repo)
             packageGroup.convention(extension.packageGroup)
             descriptionRegex.convention(extension.repositoryDescription.map { "\\b" + Regex.escape(it) + "(\\s|$)" })