[cordova-android] branch master updated: fix: maven-publish setup (#1295)

[er...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git


The following commit(s) were added to refs/heads/master by this push:
     new 9027130  fix: maven-publish setup (#1295)
9027130 is described below

commit 90271301fbb376a1541e6fd93160b84386b86580
Author: エリス <er...@users.noreply.github.com>
AuthorDate: Tue Jul 27 21:03:14 2021 +0900

    fix: maven-publish setup (#1295)
---
 framework/cordova-publish.gradle | 48 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/framework/cordova-publish.gradle b/framework/cordova-publish.gradle
index 9526ea3..30d9e4e 100644
--- a/framework/cordova-publish.gradle
+++ b/framework/cordova-publish.gradle
@@ -18,6 +18,7 @@
 */
 
 apply plugin: 'maven-publish'
+apply plugin: 'signing'
 
 String getCordovaAndroidVersion() {
    // Fetch Data from Cordova-Android package.json (Used only by framework build/publishing)
@@ -29,6 +30,22 @@ String getCordovaAndroidVersion() {
     }
 }
 
+// Enable signing by default when keyId and secretKeyRingFile is defined.
+ext.cdvEnableSigning = project.hasProperty('signing.keyId') && project.hasProperty('signing.secretKeyRingFile')
+if (cdvEnableSigning) {
+    logger.debug('[Cordova] Signing has been enabled by default because the signing keyId & secretKeyRingFile has been defined.')
+}
+
+if (project.hasProperty('signEnabled')) {
+    if(!cdvEnableSigning && Boolean.valueOf(signEnabled)) {
+        logger.debug("[Cordova] The \"signEnabled\" override can not be set to \"true\" when the signing properties are missing.")
+    } else {
+        // Override the default setting with the "signEnabled" property. (In this case it should only accept false)
+        logger.debug("[Cordova] The \"signEnabled\" property has been detected and forcing enabled signing to \"$signEnabled\".")
+        cdvEnableSigning = signEnabled
+    }
+}
+
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
     classifier = 'sources'
@@ -36,7 +53,7 @@ task sourcesJar(type: Jar) {
 
 publishing {
     publications {
-        Cordova(MavenPublication) {
+        mavenJava(MavenPublication) {
             groupId = 'org.apache.cordova'
             artifactId = 'framework'
             version = getCordovaAndroidVersion()
@@ -76,4 +93,33 @@ publishing {
             }
         }
     }
+
+    repositories {
+        maven {
+            def releasesRepoUrl = 'https://repository.apache.org/content/repositories/releases'
+            def snapshotsRepoUrl = 'https://repository.apache.org/content/repositories/snapshots'
+
+            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+
+            credentials {
+                if (project.hasProperty('apacheUsername') && project.hasProperty('apachePassword')) {
+                    username apacheUsername
+                    password apachePassword
+                }
+            }
+        }
+    }
+
+    signing {
+        if (Boolean.valueOf(cdvEnableSigning)) {
+            sign publishing.publications.mavenJava
+        }
+    }
+}
+
+tasks.whenTaskAdded {task ->
+    if(task.name.contains('sign')) {
+        logger.debug("[Cordova] The task \"${task.name}\" is enabled? ${cdvEnableSigning}")
+        task.enabled = cdvEnableSigning
+    }
 }

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org