Fix a bug with artifact signing and release v1.12.7

mockk · Aug 23, 2022 · 35e4dea · 35e4dea
1 parent ae698e2
commit 35e4dea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts
@@ -22,8 +22,6 @@ val sonatypeRepositoryReleaseUrl: Provider<String> = provider {
 
 val signingKeyId: Provider<String> =
     providers.gradleProperty("signing.keyId")
-val signingKey: Provider<String> =
-    providers.gradleProperty("signing.key")
 val signingPassword: Provider<String> =
     providers.gradleProperty("signing.password")
 val signingSecretKeyRingFile: Provider<String> =
@@ -82,16 +80,16 @@ publishing {
 
         artifact(tasks.provider<Jar>("javadocJar"))
 
-        if (signingKeyId.isPresent() && signingKey.isPresent() && signingPassword.isPresent()) {
+        if (signingKeyId.isPresent() && signingSecretKeyRingFile.isPresent() && signingPassword.isPresent()) {
             signing.sign(this)
         }
+
     }
 }
 
 signing {
-    if (signingKeyId.isPresent() && signingKey.isPresent() && signingPassword.isPresent()) {
+    if (signingKeyId.isPresent() && signingSecretKeyRingFile.isPresent() && signingPassword.isPresent()) {
         logger.debug("[${project.displayName}] Signing is enabled")
-        useInMemoryPgpKeys(signingKeyId.get(), signingKey.get(), signingPassword.get())
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=1.12.7-SNAPSHOT
+version=1.12.8-SNAPSHOT
 # Enable Gradle build cache https://docs.gradle.org/current/userguide/build_cache.html
 org.gradle.caching=true
 org.gradle.configureondemand=false