Merge pull request #242 from TWiStErRob/idg

Partially refactor to use more idiomatic Gradle (part 2)
gradle-nexus · Jul 14, 2023 · 66f3284 · 66f3284
2 parents 65863e1 + 7885598
commit 66f3284
Show file tree

Hide file tree

Showing 14 changed files with 161 additions and 196 deletions.
diff --git a/src/main/kotlin/io/github/gradlenexus/publishplugin/AbstractNexusStagingRepositoryTask.kt b/src/main/kotlin/io/github/gradlenexus/publishplugin/AbstractNexusStagingRepositoryTask.kt
@@ -17,17 +17,13 @@
 package io.github.gradlenexus.publishplugin
 
 import org.gradle.api.DefaultTask
-import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Nested
-import org.gradle.kotlin.dsl.property
 import java.time.Duration
-import javax.inject.Inject
 
-abstract class AbstractNexusStagingRepositoryTask @Inject
-constructor(objects: ObjectFactory, repository: NexusRepository) : DefaultTask() {
+abstract class AbstractNexusStagingRepositoryTask : DefaultTask() {
 
     @get:Internal
     abstract val clientTimeout: Property<Duration>
@@ -36,16 +32,14 @@ constructor(objects: ObjectFactory, repository: NexusRepository) : DefaultTask()
     abstract val connectTimeout: Property<Duration>
 
     // TODO: Expose externally as interface with getters only
-    @Nested
-    val repository = objects.property<NexusRepository>().apply {
-        set(repository)
-    }
+    @get:Nested
+    abstract val repository: Property<NexusRepository>
 
     @get:Input
     abstract val repositoryDescription: Property<String>
 
     @get:Internal
-    internal abstract val useStaging: Property<Boolean>
+    abstract val useStaging: Property<Boolean>
 
     init {
         this.onlyIf { useStaging.getOrElse(false) }

diff --git a/...otlin/io/github/gradlenexus/publishplugin/AbstractTransitionNexusStagingRepositoryTask.kt b/...otlin/io/github/gradlenexus/publishplugin/AbstractTransitionNexusStagingRepositoryTask.kt
@@ -17,38 +17,26 @@
 package io.github.gradlenexus.publishplugin
 
 import io.github.gradlenexus.publishplugin.internal.BasicActionRetrier
-import io.github.gradlenexus.publishplugin.internal.InvalidatingStagingRepositoryDescriptorRegistry
 import io.github.gradlenexus.publishplugin.internal.NexusClient
 import io.github.gradlenexus.publishplugin.internal.StagingRepository
 import io.github.gradlenexus.publishplugin.internal.StagingRepositoryTransitioner
 import org.gradle.api.Action
-import org.gradle.api.model.ObjectFactory
 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.TaskAction
-import org.gradle.kotlin.dsl.property
 
-abstract class AbstractTransitionNexusStagingRepositoryTask(
-    objects: ObjectFactory,
-    repository: NexusRepository,
-    registry: Provider<InvalidatingStagingRepositoryDescriptorRegistry>
-) : AbstractNexusStagingRepositoryTask(objects, repository) {
+abstract class AbstractTransitionNexusStagingRepositoryTask : AbstractNexusStagingRepositoryTask() {
 
-    @Input
-    val stagingRepositoryId = objects.property<String>().apply {
-        set(
-            registry.map {
-                it[repository.name].stagingRepositoryId
-            }
-        )
-    }
+    @get:Input
+    abstract val stagingRepositoryId: Property<String>
 
     @get:Internal
     abstract val transitionCheckOptions: Property<TransitionCheckOptions>
 
-    fun transitionCheckOptions(action: Action<in TransitionCheckOptions>) = action.execute(transitionCheckOptions.get())
+    fun transitionCheckOptions(action: Action<in TransitionCheckOptions>) {
+        action.execute(transitionCheckOptions.get())
+    }
 
     @TaskAction
     fun transitionStagingRepo() {

diff --git a/src/main/kotlin/io/github/gradlenexus/publishplugin/CloseNexusStagingRepository.kt b/src/main/kotlin/io/github/gradlenexus/publishplugin/CloseNexusStagingRepository.kt
@@ -16,21 +16,13 @@
 
 package io.github.gradlenexus.publishplugin
 
-import io.github.gradlenexus.publishplugin.internal.InvalidatingStagingRepositoryDescriptorRegistry
 import io.github.gradlenexus.publishplugin.internal.StagingRepositoryTransitioner
-import org.gradle.api.model.ObjectFactory
-import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.options.Option
-import javax.inject.Inject
 
-abstract class CloseNexusStagingRepository @Inject constructor(
-    objects: ObjectFactory,
-    repository: NexusRepository,
-    registry: Provider<InvalidatingStagingRepositoryDescriptorRegistry>
-) : AbstractTransitionNexusStagingRepositoryTask(objects, repository, registry) {
+abstract class CloseNexusStagingRepository : AbstractTransitionNexusStagingRepositoryTask() {
 
     @Option(option = "staging-repository-id", description = "staging repository id to close")
-    fun setStagingRepositoryId(stagingRepositoryId: String) {
+    fun setStagingRepositoryIdToClose(stagingRepositoryId: String) {
         this.stagingRepositoryId.set(stagingRepositoryId)
     }
 

diff --git a/src/main/kotlin/io/github/gradlenexus/publishplugin/FindStagingRepository.kt b/src/main/kotlin/io/github/gradlenexus/publishplugin/FindStagingRepository.kt
@@ -20,36 +20,27 @@ import io.github.gradlenexus.publishplugin.internal.InvalidatingStagingRepositor
 import io.github.gradlenexus.publishplugin.internal.NexusClient
 import org.gradle.api.GradleException
 import org.gradle.api.Incubating
-import org.gradle.api.model.ObjectFactory
-import org.gradle.api.provider.Provider
+import org.gradle.api.provider.Property
 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 org.gradle.kotlin.dsl.property
-import javax.inject.Inject
 
 @Incubating
-abstract class FindStagingRepository @Inject constructor(
-    objects: ObjectFactory,
-    extension: NexusPublishExtension,
-    repository: NexusRepository,
-    private val registry: Provider<InvalidatingStagingRepositoryDescriptorRegistry>
-) : AbstractNexusStagingRepositoryTask(objects, repository) {
+abstract class FindStagingRepository : AbstractNexusStagingRepositoryTask() {
 
-    @Optional
-    @Input
-    val packageGroup = objects.property<String>().apply {
-        set(extension.packageGroup)
-    }
+    @get:Internal
+    abstract val registry: Property<InvalidatingStagingRepositoryDescriptorRegistry>
 
-    @Input
-    val descriptionRegex = objects.property<String>().apply {
-        set(extension.repositoryDescription.map { "\\b" + Regex.escape(it) + "(\\s|$)" })
-    }
+    @get:Optional
+    @get:Input
+    abstract val packageGroup: Property<String>
+
+    @get:Input
+    abstract val descriptionRegex: Property<String>
 
-    @Internal
-    val stagingRepositoryId = objects.property<String>()
+    @get:Internal
+    abstract val stagingRepositoryId: Property<String>
 
     init {
         outputs.cacheIf("the task requests data from the external repository, so we don't want to cache it") {

diff --git a/src/main/kotlin/io/github/gradlenexus/publishplugin/InitializeNexusStagingRepository.kt b/src/main/kotlin/io/github/gradlenexus/publishplugin/InitializeNexusStagingRepository.kt
@@ -20,26 +20,20 @@ import io.github.gradlenexus.publishplugin.internal.InvalidatingStagingRepositor
 import io.github.gradlenexus.publishplugin.internal.NexusClient
 import okhttp3.HttpUrl
 import org.gradle.api.GradleException
-import org.gradle.api.model.ObjectFactory
-import org.gradle.api.provider.Provider
+import org.gradle.api.provider.Property
 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 org.gradle.kotlin.dsl.property
-import javax.inject.Inject
 
-abstract class InitializeNexusStagingRepository @Inject constructor(
-    objects: ObjectFactory,
-    extension: NexusPublishExtension,
-    repository: NexusRepository,
-    private val registry: Provider<InvalidatingStagingRepositoryDescriptorRegistry>
-) : AbstractNexusStagingRepositoryTask(objects, repository) {
+abstract class InitializeNexusStagingRepository : AbstractNexusStagingRepositoryTask() {
 
-    @Optional
-    @Input
-    val packageGroup = objects.property<String>().apply {
-        set(extension.packageGroup)
-    }
+    @get:Internal
+    abstract val registry: Property<InvalidatingStagingRepositoryDescriptorRegistry>
+
+    @get:Optional
+    @get:Input
+    abstract val packageGroup: Property<String>
 
     @TaskAction
     fun createStagingRepo() {

diff --git a/src/main/kotlin/io/github/gradlenexus/publishplugin/NexusPublishExtension.kt b/src/main/kotlin/io/github/gradlenexus/publishplugin/NexusPublishExtension.kt
@@ -17,7 +17,6 @@
 package io.github.gradlenexus.publishplugin
 
 import org.gradle.api.Action
-import org.gradle.api.NamedDomainObjectFactory
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Nested
@@ -38,28 +37,23 @@ abstract class NexusPublishExtension @Inject constructor(objects: ObjectFactory)
 
     abstract val repositoryDescription: Property<String>
 
-    // staging repository initialization can take a few minutes on Sonatype Nexus
     abstract val clientTimeout: Property<Duration>
 
     abstract val connectTimeout: Property<Duration>
 
     @get:Nested
     abstract val transitionCheckOptions: TransitionCheckOptions
 
-    fun transitionCheckOptions(action: Action<in TransitionCheckOptions>) = action.execute(transitionCheckOptions)
+    fun transitionCheckOptions(action: Action<in TransitionCheckOptions>) {
+        action.execute(transitionCheckOptions)
+    }
 
     val repositories: NexusRepositoryContainer = objects.newInstance(
         DefaultNexusRepositoryContainer::class,
-        // `objects.domainObjectContainer(NexusRepository::class) { name -> ... }`,
-        // but in Kotlin 1.3 "New Inference" is not implemented yet, so we have to be explicit.
-        // https://kotlinlang.org/docs/whatsnew14.html#new-more-powerful-type-inference-algorithm
-        objects.domainObjectContainer(
-            NexusRepository::class,
-            NamedDomainObjectFactory { name ->
-                objects.newInstance(NexusRepository::class, name)
-            }
-        )
+        objects.domainObjectContainer(NexusRepository::class)
     )
 
-    fun repositories(action: Action<in NexusRepositoryContainer>) = action.execute(repositories)
+    fun repositories(action: Action<in NexusRepositoryContainer>) {
+        action.execute(repositories)
+    }
 }