From a22e537c26f1ee9481980c8067921bb33a527c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Zaj=C4=85czkowski?= Date: Fri, 3 Jan 2020 15:49:40 +0100 Subject: [PATCH] [#4] Simplify NexusStagingRepository class --- .../AbstractNexusStagingRepositoryTask.kt | 2 +- .../CloseNexusStagingRepository.kt | 6 ++---- .../publishplugin/NexusStagingRepository.kt | 17 ++--------------- .../ReleaseNexusStagingRepository.kt | 6 ++---- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/src/main/kotlin/io/github/gradlenexus/publishplugin/AbstractNexusStagingRepositoryTask.kt b/src/main/kotlin/io/github/gradlenexus/publishplugin/AbstractNexusStagingRepositoryTask.kt index a15247da..8465974c 100644 --- a/src/main/kotlin/io/github/gradlenexus/publishplugin/AbstractNexusStagingRepositoryTask.kt +++ b/src/main/kotlin/io/github/gradlenexus/publishplugin/AbstractNexusStagingRepositoryTask.kt @@ -67,6 +67,6 @@ constructor(objects: ObjectFactory, extension: NexusPublishExtension, repository } protected fun keepStagingRepositoryIdInExtension(stagingRepositoryIdAsString: String) { - repository.get().stagingRepository.set(NexusStagingRepository(stagingRepositoryIdAsString, project)) + repository.get().stagingRepository.set(NexusStagingRepository(stagingRepositoryIdAsString)) } } diff --git a/src/main/kotlin/io/github/gradlenexus/publishplugin/CloseNexusStagingRepository.kt b/src/main/kotlin/io/github/gradlenexus/publishplugin/CloseNexusStagingRepository.kt index a0114e39..1e62f28d 100644 --- a/src/main/kotlin/io/github/gradlenexus/publishplugin/CloseNexusStagingRepository.kt +++ b/src/main/kotlin/io/github/gradlenexus/publishplugin/CloseNexusStagingRepository.kt @@ -19,7 +19,6 @@ package io.github.gradlenexus.publishplugin import io.github.gradlenexus.publishplugin.internal.NexusClient import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.Property -import org.gradle.api.tasks.Input import org.gradle.api.tasks.Nested import org.gradle.api.tasks.TaskAction import org.gradle.kotlin.dsl.property @@ -30,7 +29,6 @@ open class CloseNexusStagingRepository @Inject constructor(objects: ObjectFactory, extension: NexusPublishExtension, repository: NexusRepository) : AbstractNexusStagingRepositoryTask(objects, extension, repository) { - @get:Input @get:Nested val stagingRepository: Property = objects.property() @@ -45,8 +43,8 @@ constructor(objects: ObjectFactory, extension: NexusPublishExtension, repository fun closeStagingRepo() { val client = NexusClient(repository.get().nexusUrl.get(), repository.get().username.orNull, repository.get().password.orNull, clientTimeout.orNull, connectTimeout.orNull) val stagingProfileId = determineStagingProfileId(client) - logger.info("Closing staging repository with id '{}' for stagingProfileId '{}'", stagingRepository.get().stagingRepositoryId.get(), stagingProfileId) - client.closeStagingRepository(stagingRepository.get().stagingRepositoryId.get()) + logger.info("Closing staging repository with id '{}' for stagingProfileId '{}'", stagingRepository.get().id, stagingProfileId) + client.closeStagingRepository(stagingRepository.get().id) // TODO: Broken with real Nexus - waiting for effective execution is also required https://github.com/gradle-nexus/publish-plugin/issues/7 } } diff --git a/src/main/kotlin/io/github/gradlenexus/publishplugin/NexusStagingRepository.kt b/src/main/kotlin/io/github/gradlenexus/publishplugin/NexusStagingRepository.kt index 88ff1dd8..2d0108d5 100644 --- a/src/main/kotlin/io/github/gradlenexus/publishplugin/NexusStagingRepository.kt +++ b/src/main/kotlin/io/github/gradlenexus/publishplugin/NexusStagingRepository.kt @@ -16,19 +16,6 @@ package io.github.gradlenexus.publishplugin -import org.gradle.api.Project -import org.gradle.api.provider.Property -import org.gradle.api.tasks.Internal -import org.gradle.kotlin.dsl.property -import javax.inject.Inject +import org.gradle.api.tasks.Input -@Suppress("UnstableApiUsage") -open class NexusStagingRepository @Inject constructor(stagingRepositoryIdAsString: String, project: Project) { - - @Internal - val stagingRepositoryId: Property = project.objects.property() - - init { - stagingRepositoryId.set(stagingRepositoryIdAsString) - } -} +open class NexusStagingRepository constructor(@get:Input val id: String) diff --git a/src/main/kotlin/io/github/gradlenexus/publishplugin/ReleaseNexusStagingRepository.kt b/src/main/kotlin/io/github/gradlenexus/publishplugin/ReleaseNexusStagingRepository.kt index 7536f578..e454bb53 100644 --- a/src/main/kotlin/io/github/gradlenexus/publishplugin/ReleaseNexusStagingRepository.kt +++ b/src/main/kotlin/io/github/gradlenexus/publishplugin/ReleaseNexusStagingRepository.kt @@ -19,7 +19,6 @@ package io.github.gradlenexus.publishplugin import io.github.gradlenexus.publishplugin.internal.NexusClient import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.Property -import org.gradle.api.tasks.Input import org.gradle.api.tasks.Nested import org.gradle.api.tasks.TaskAction import org.gradle.kotlin.dsl.property @@ -31,7 +30,6 @@ open class ReleaseNexusStagingRepository @Inject constructor(objects: ObjectFactory, extension: NexusPublishExtension, repository: NexusRepository) : AbstractNexusStagingRepositoryTask(objects, extension, repository) { - @get:Input @get:Nested val stagingRepository: Property = objects.property() @@ -46,8 +44,8 @@ constructor(objects: ObjectFactory, extension: NexusPublishExtension, repository fun releaseStagingRepo() { val client = NexusClient(repository.get().nexusUrl.get(), repository.get().username.orNull, repository.get().password.orNull, clientTimeout.orNull, connectTimeout.orNull) val stagingProfileId = determineStagingProfileId(client) // TODO: Will it update value in extension? - logger.info("Releasing staging repository with id '{}' for stagingProfileId '{}'", stagingRepository.get().stagingRepositoryId.get(), stagingProfileId) - client.releaseStagingRepository(stagingRepository.get().stagingRepositoryId.get()) + logger.info("Releasing staging repository with id '{}' for stagingProfileId '{}'", stagingRepository.get().id, stagingProfileId) + client.releaseStagingRepository(stagingRepository.get().id) // TODO: Broken with real Nexus - waiting for effective execution is also required https://github.com/gradle-nexus/publish-plugin/issues/7 } }