Skip to content

Commit

Permalink
Rename Task classes
Browse files Browse the repository at this point in the history
  • Loading branch information
@TWiStErRob
TWiStErRob committed Jul 18, 2023
1 parent 700bd5f commit c7a8209
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion ...lishplugin/CloseNexusStagingRepository.kt → ...plugin/CloseNexusStagingRepositoryTask.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package io.github.gradlenexus.publishplugin
import io.github.gradlenexus.publishplugin.internal.StagingRepositoryTransitioner
import org.gradle.api.tasks.options.Option

abstract class CloseNexusStagingRepository : AbstractTransitionNexusStagingRepositoryTask() {
abstract class CloseNexusStagingRepositoryTask : AbstractTransitionNexusStagingRepositoryTask() {

@Option(option = "staging-repository-id", description = "staging repository id to close")
fun setStagingRepositoryIdToClose(stagingRepositoryId: String) {
Expand Down
2 changes: 1 addition & 1 deletion ...us/publishplugin/FindStagingRepository.kt → ...ublishplugin/FindStagingRepositoryTask.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.gradle.api.tasks.Optional
import org.gradle.api.tasks.TaskAction

@Incubating
abstract class FindStagingRepository : AbstractNexusStagingRepositoryTask() {
abstract class FindStagingRepositoryTask : AbstractNexusStagingRepositoryTask() {

@get:Internal
abstract val registry: Property<InvalidatingStagingRepositoryDescriptorRegistry>
Expand Down
2 changes: 1 addition & 1 deletion ...lugin/InitializeNexusStagingRepository.kt → ...n/InitializeNexusStagingRepositoryTask.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.Optional
import org.gradle.api.tasks.TaskAction

abstract class InitializeNexusStagingRepository : AbstractNexusStagingRepositoryTask() {
abstract class InitializeNexusStagingRepositoryTask : AbstractNexusStagingRepositoryTask() {

@get:Internal
abstract val registry: Property<InvalidatingStagingRepositoryDescriptorRegistry>
Expand Down
34 changes: 17 additions & 17 deletions src/main/kotlin/io/github/gradlenexus/publishplugin/NexusPublishPlugin.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class NexusPublishPlugin : Plugin<Project> {
registryProvider: Provider<InvalidatingStagingRepositoryDescriptorRegistry>
) {
@Suppress("UNUSED_VARIABLE") // Keep it consistent.
val retrieveStagingProfileTask = tasks.register<RetrieveStagingProfile>(
val retrieveStagingProfileTask = tasks.register<RetrieveStagingProfileTask>(
"retrieve${repo.capitalizedName}StagingProfile"
) {
group = PublishingPlugin.PUBLISH_TASK_GROUP
Expand All @@ -149,7 +149,7 @@ class NexusPublishPlugin : Plugin<Project> {
repository.convention(repo)
packageGroup.convention(extension.packageGroup)
}
val initializeTask = tasks.register<InitializeNexusStagingRepository>(
val initializeTask = tasks.register<InitializeNexusStagingRepositoryTask>(
"initialize${repo.capitalizedName}StagingRepository"
) {
group = PublishingPlugin.PUBLISH_TASK_GROUP
Expand All @@ -158,7 +158,7 @@ class NexusPublishPlugin : Plugin<Project> {
repository.convention(repo)
packageGroup.convention(extension.packageGroup)
}
val findStagingRepository = tasks.register<FindStagingRepository>(
val findTask = tasks.register<FindStagingRepositoryTask>(
"find${repo.capitalizedName}StagingRepository"
) {
group = PublishingPlugin.PUBLISH_TASK_GROUP
Expand All @@ -168,14 +168,14 @@ class NexusPublishPlugin : Plugin<Project> {
packageGroup.convention(extension.packageGroup)
descriptionRegex.convention(extension.repositoryDescription.map { "\\b" + Regex.escape(it) + "(\\s|$)" })
}
val closeTask = tasks.register<CloseNexusStagingRepository>(
val closeTask = tasks.register<CloseNexusStagingRepositoryTask>(
"close${repo.capitalizedName}StagingRepository"
) {
group = PublishingPlugin.PUBLISH_TASK_GROUP
description = "Closes open staging repository in '${repo.name}' Nexus instance."
repository.convention(repo)
}
val releaseTask = tasks.register<ReleaseNexusStagingRepository>(
val releaseTask = tasks.register<ReleaseNexusStagingRepositoryTask>(
"release${repo.capitalizedName}StagingRepository"
) {
group = PublishingPlugin.PUBLISH_TASK_GROUP
Expand All @@ -191,11 +191,11 @@ class NexusPublishPlugin : Plugin<Project> {

closeTask {
mustRunAfter(initializeTask)
mustRunAfter(findStagingRepository)
mustRunAfter(findTask)
}
releaseTask {
mustRunAfter(initializeTask)
mustRunAfter(findStagingRepository)
mustRunAfter(findTask)
mustRunAfter(closeTask)
}
closeAndReleaseTask {
Expand All @@ -216,10 +216,10 @@ class NexusPublishPlugin : Plugin<Project> {
PublicationType.MAVEN -> "maven-publish"
}
plugins.withId(id) {
val initializeTask = rootProject.tasks.named<InitializeNexusStagingRepository>("initialize${nexusRepo.capitalizedName}StagingRepository")
val findStagingRepositoryTask = rootProject.tasks.named<FindStagingRepository>("find${nexusRepo.capitalizedName}StagingRepository")
val closeTask = rootProject.tasks.named<CloseNexusStagingRepository>("close${nexusRepo.capitalizedName}StagingRepository")
val releaseTask = rootProject.tasks.named<ReleaseNexusStagingRepository>("release${nexusRepo.capitalizedName}StagingRepository")
val initializeTask = rootProject.tasks.named<InitializeNexusStagingRepositoryTask>("initialize${nexusRepo.capitalizedName}StagingRepository")
val findTask = rootProject.tasks.named<FindStagingRepositoryTask>("find${nexusRepo.capitalizedName}StagingRepository")
val closeTask = rootProject.tasks.named<CloseNexusStagingRepositoryTask>("close${nexusRepo.capitalizedName}StagingRepository")
val releaseTask = rootProject.tasks.named<ReleaseNexusStagingRepositoryTask>("release${nexusRepo.capitalizedName}StagingRepository")
val publishAllTask = publishingProject.tasks.register("publishTo${nexusRepo.capitalizedName}") {
group = PublishingPlugin.PUBLISH_TASK_GROUP
description = "Publishes all Maven/Ivy publications produced by this project to the '${nexusRepo.name}' Nexus repository."
Expand All @@ -230,7 +230,7 @@ class NexusPublishPlugin : Plugin<Project> {
releaseTask {
mustRunAfter(publishAllTask)
}
configureTaskDependencies(publishingProject, initializeTask, findStagingRepositoryTask, publishAllTask, closeTask, releaseTask, publicationRepo, publicationType)
configureTaskDependencies(publishingProject, initializeTask, findTask, publishAllTask, closeTask, releaseTask, publicationRepo, publicationType)
}
}
}
Expand Down Expand Up @@ -288,11 +288,11 @@ class NexusPublishPlugin : Plugin<Project> {

private fun configureTaskDependencies(
project: Project,
initializeTask: TaskProvider<InitializeNexusStagingRepository>,
findStagingRepositoryTask: TaskProvider<FindStagingRepository>,
initializeTask: TaskProvider<InitializeNexusStagingRepositoryTask>,
findTask: TaskProvider<FindStagingRepositoryTask>,
publishAllTask: TaskProvider<Task>,
closeTask: TaskProvider<CloseNexusStagingRepository>,
releaseTask: TaskProvider<ReleaseNexusStagingRepository>,
closeTask: TaskProvider<CloseNexusStagingRepositoryTask>,
releaseTask: TaskProvider<ReleaseNexusStagingRepositoryTask>,
artifactRepo: ArtifactRepository,
publicationType: PublicationType
) {
Expand All @@ -305,7 +305,7 @@ class NexusPublishPlugin : Plugin<Project> {
)
publishTask {
dependsOn(initializeTask)
mustRunAfter(findStagingRepositoryTask)
mustRunAfter(findTask)
doFirst {
if (artifactRepo is UrlArtifactRepository) {
logger.info("Uploading to {}", artifactRepo.url)
Expand Down
2 changes: 1 addition & 1 deletion ...shplugin/ReleaseNexusStagingRepository.kt → ...ugin/ReleaseNexusStagingRepositoryTask.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package io.github.gradlenexus.publishplugin
import io.github.gradlenexus.publishplugin.internal.StagingRepositoryTransitioner
import org.gradle.api.tasks.options.Option

abstract class ReleaseNexusStagingRepository : AbstractTransitionNexusStagingRepositoryTask() {
abstract class ReleaseNexusStagingRepositoryTask : AbstractTransitionNexusStagingRepositoryTask() {

@Option(option = "staging-repository-id", description = "staging repository id to release")
fun setStagingRepositoryIdToRelease(stagingRepositoryId: String) {
Expand Down
2 changes: 1 addition & 1 deletion ...s/publishplugin/RetrieveStagingProfile.kt → ...blishplugin/RetrieveStagingProfileTask.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.gradle.api.tasks.TaskAction
* Diagnostic task for retrieving the [NexusRepository.stagingProfileId] for the [packageGroup] from the provided [NexusRepository] and logging it
*/
@Incubating
abstract class RetrieveStagingProfile : AbstractNexusStagingRepositoryTask() {
abstract class RetrieveStagingProfileTask : AbstractNexusStagingRepositoryTask() {

@get:Input
abstract val packageGroup: Property<String>
Expand Down

0 comments on commit c7a8209

Please sign in to comment.