Update publication signature check

voxeet · Feb 4, 2024 · c2ab917 · c2ab917
1 parent a439cc0
commit c2ab917
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/configurations/kt-plugins/src/main/kotlin/publication.gradle.kts b/configurations/kt-plugins/src/main/kotlin/publication.gradle.kts
@@ -74,7 +74,10 @@ publishing {
     }
 }
 
+val hasSigningKeyId = listOf("signing.keyId", "signingKeyId")
+    .mapNotNull { rootProject.getExtraString(it) }.isNotEmpty()
+
 signing {
-    isRequired = (null != rootProject.getExtraString("signingKeyId"))
+    isRequired = hasSigningKeyId
     sign(publishing.publications)
 }
diff --git a/configurations/publishing.gradle b/configurations/publishing.gradle
@@ -3,7 +3,9 @@ apply plugin: 'signing'
 
 afterEvaluate {
 
-    def signingKeyId = rootProject.ext.prop("signingKeyId", null) as String
+    def signingKeyId = [ "signing.keyId", "signingKeyId"]
+            .collect { rootProject.ext.prop(it, null) }
+            .find { null != it} as String
 
     task sourceJar(type: Jar) {
         from android.sourceSets.main.java.srcDirs

diff --git a/dolbyio.gradle b/dolbyio.gradle
@@ -1,4 +1,4 @@
-def version = 'v1.6.6'
+def version = 'v1.7.0'
 
 if (settings.ext.find("DOLBYIO_GRADLE_VERSION_USED")) {
     version = DOLBYIO_GRADLE_VERSION_USED