refactor: rename findSigningTaskIn into signingTasks

DanySK · Feb 17, 2023 · 0ea08c6 · 0ea08c6
1 parent b1458ed
commit 0ea08c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/kotlin/org/danilopianini/gradle/mavencentral/Configuration.kt b/src/main/kotlin/org/danilopianini/gradle/mavencentral/Configuration.kt
@@ -36,8 +36,10 @@ fun MavenPublication.configureForMavenCentral(extension: PublishOnCentralExtensi
     configurePomForMavenCentral(extension)
     val project = extension.project
     // Signing
-    findSigningTaskIn(project) ?: project.configure<SigningExtension> {
-        sign(this@configureForMavenCentral)
+    if (signingTasks(project).isEmpty()) {
+        project.configure<SigningExtension> {
+            sign(this@configureForMavenCentral)
+        }
     }
 }
 
@@ -173,7 +175,7 @@ private fun Project.configureNexusRepository(repoToConfigure: Repository, nexusU
                 }
             }
             uploadTask.publication = publication
-            publication.findSigningTaskIn(project).forEach {
+            publication.signingTasks(project).forEach {
                 uploadTask.dependsOn(it)
             }
             tasks.withType<Sign>().forEach {
@@ -214,5 +216,5 @@ private fun Project.warnIfCredentialsAreMissing(repository: Repository) {
 /**
  * Returns the signign tasks registered for the [MavenPublication] in the current [project].
  */
-fun MavenPublication.findSigningTaskIn(project: Project) =
+fun MavenPublication.signingTasks(project: Project): Collection<Sign> =
     project.tasks.withType<Sign>().matching { it.name.endsWith("sign${name.capitalized()}Publication") }
diff --git a/src/main/kotlin/org/danilopianini/gradle/mavencentral/PublishOnCentral.kt b/src/main/kotlin/org/danilopianini/gradle/mavencentral/PublishOnCentral.kt
@@ -59,7 +59,7 @@ class PublishOnCentral : Plugin<Project> {
             publications.withType<MavenPublication>().configureEach { publication ->
                 if (extension.autoConfigureAllPublications.getOrElse(true) && publication !in createdPublications) {
                     publication.configurePomForMavenCentral(extension)
-                    if (publication.findSigningTaskIn(project).isEmpty()) {
+                    if (publication.signingTasks(project).isEmpty()) {
                         project.configure<SigningExtension> {
                             sign(publication)
                         }