Use subkeys for signing

Requires specifying the key ID.
ajoberstar · Feb 18, 2024 · 1a18813 · 1a18813
1 parent a176ffe
commit 1a18813
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -122,9 +122,10 @@ publishing {
 
 signing {
   setRequired(providers.environmentVariable("CI").orNull)
+  val signingKeyId: String? by project
   val signingKey: String? by project
   val signingPassphrase: String? by project
-  useInMemoryPgpKeys(signingKey, signingPassphrase)
+  useInMemoryPgpKeys(signingKeyId, signingKey, signingPassphrase)
   sign(publishing.publications)
 }
 

diff --git a/src/main/java/org/ajoberstar/gradle/defaults/MavenCentralConventionPlugin.java b/src/main/java/org/ajoberstar/gradle/defaults/MavenCentralConventionPlugin.java
@@ -91,11 +91,12 @@ private void configurePom(Project project, PublishingExtension publishing, Maven
   private void enableSigning(Project project, SigningExtension signing, PublishingExtension publishing) {
     var isCi = project.getProviders().environmentVariable("CI");
 
+    var signingKeyId = project.getProviders().gradleProperty("signingKeyId");
     var signingKey = project.getProviders().gradleProperty("signingKey");
     var signingPassphrase = project.getProviders().gradleProperty("signingPassphrase");
 
     signing.setRequired(isCi.getOrNull());
-    signing.useInMemoryPgpKeys(signingKey.getOrNull(), signingPassphrase.getOrNull());
+    signing.useInMemoryPgpKeys(signingKeyId.getOrNull(), signingKey.getOrNull(), signingPassphrase.getOrNull());
     signing.sign(publishing.getPublications());
   }
 }