Simplify signing config (#4971)

detekt · Jun 20, 2022 · ecd28cf · ecd28cf
1 parent 06ee239
commit ecd28cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/build-logic/src/main/kotlin/packaging.gradle.kts b/build-logic/src/main/kotlin/packaging.gradle.kts
@@ -66,10 +66,12 @@ if (signingKey.isNullOrBlank() || signingPwd.isNullOrBlank()) {
     logger.info("Signing disabled as the GPG key was not found")
 } else {
     logger.info("GPG Key found - Signing enabled")
-    signing {
-        useInMemoryPgpKeys(signingKey, signingPwd)
-        publishing.publications.forEach(::sign)
-    }
+}
+
+signing {
+    useInMemoryPgpKeys(signingKey, signingPwd)
+    sign(publishing.publications)
+    isRequired = !(signingKey.isNullOrBlank() || signingPwd.isNullOrBlank())
 }
 
 val String.byProperty: String? get() = findProperty(this) as? String
diff --git a/detekt-gradle-plugin/build.gradle.kts b/detekt-gradle-plugin/build.gradle.kts
@@ -6,7 +6,6 @@ plugins {
     `java-gradle-plugin`
     `java-test-fixtures`
     idea
-    signing
     alias(libs.plugins.pluginPublishing)
     // We use this published version of the Detekt plugin to self analyse this project.
     id("io.gitlab.arturbosch.detekt") version "1.20.0"
@@ -166,20 +165,6 @@ tasks.withType<Sign>().configureEach {
     notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/13470")
 }
 
-val signingKey = "SIGNING_KEY".byProperty
-val signingPwd = "SIGNING_PWD".byProperty
-if (signingKey.isNullOrBlank() || signingPwd.isNullOrBlank()) {
-    logger.info("Signing disabled as the GPG key was not found")
-} else {
-    logger.info("GPG Key found - Signing enabled")
-    afterEvaluate {
-        signing {
-            useInMemoryPgpKeys(signingKey, signingPwd)
-            publishing.publications.forEach(::sign)
-        }
-    }
-}
-
 afterEvaluate {
     publishing {
         publications.filterIsInstance<MavenPublication>().forEach {