From 35e4dea31e0ea1dd1e4c6dd41908741a1e927ded Mon Sep 17 00:00:00 2001 From: Mattia Tommasone Date: Tue, 23 Aug 2022 15:01:58 +0200 Subject: [PATCH] Fix a bug with artifact signing and release v1.12.7 --- .../buildsrc/convention/mockk-publishing.gradle.kts | 8 +++----- gradle.properties | 2 +- 2 files changed, 4 insertions(+), 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 index ab301aa9e..1f7a1cb64 100644 --- 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 = provider { val signingKeyId: Provider = providers.gradleProperty("signing.keyId") -val signingKey: Provider = - providers.gradleProperty("signing.key") val signingPassword: Provider = providers.gradleProperty("signing.password") val signingSecretKeyRingFile: Provider = @@ -82,16 +80,16 @@ publishing { artifact(tasks.provider("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 index 53cea0ee0..ffe3f2b71 100644 --- 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