Tweak signing process for release 4.2-beta-1

mperry · mperry · commit 3efe5ae50a2d · 2014-08-07T23:34:12.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,6 @@
 
 defaultTasks 'build'
 
-Boolean doSigning() {
-    signingEnabled.trim() == "true"
-}
-
 ext {
 }
 
@@ -19,13 +15,15 @@ if (JavaVersion.current().isJava8Compatible()) {
 allprojects {
 
 	ext {
-        isSnapshot = true
+        isSnapshot = false
         fjBaseVersion = "4.2-beta-1"
 
         snapshotAppendix = "-SNAPSHOT"
 		fjVersion = fjBaseVersion + (isSnapshot ? snapshotAppendix : "")
         fjConsumeVersion = "4.1"
 
+        signModule = false
+
         projectTitle = "Functional Java"
 		projectName = "functionaljava"
         pomProjectName = projectTitle
@@ -74,16 +72,10 @@ subprojects {
     apply from: "$rootDir/lib.gradle"
     apply plugin: "maven"
     apply plugin: "java"
+    apply plugin: "signing"
 
     sourceCompatibility = "1.8"
 
-    if (doSigning()) {
-        apply plugin: "signing"
-        signing {
-            sign configurations.archives
-        }
-    }
-
     task javadocJar(type: Jar, dependsOn: "javadoc") {
         classifier = 'javadoc'
         from "build/docs/javadoc"
@@ -107,49 +99,6 @@ subprojects {
         }
     }
 
-    uploadArchives {
-        enabled = false
-        repositories {
-            mavenDeployer {
-                if (doSigning()) {
-                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-                }
-
-                repository(url: sonatypeUploadUrl) {
-                    authentication(userName: sonatypeUsername, password: sonatypePassword)
-                }
-                pom {
-                    groupId = project.group
-                    project {
-                        name pomProjectName
-                        packaging 'jar'
-                        description projectDescription
-                        url projectUrl
-                        organization {
-                            name pomOrganisation
-                            url projectUrl
-                        }
-                        scm {
-                            url scmUrl
-                        }
-                        licenses {
-                            license {
-                                name "The BSD3 License"
-                                url "https://github.com/functionaljava/functionaljava/blob/master/etc/LICENCE"
-                                distribution 'repo'
-                            }
-                        }
-                        developers {
-                            developer {
-                                email primaryEmail
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
 }
 
 task wrapper(type: Wrapper) {
diff --git a/core/build.gradle b/core/build.gradle
@@ -1,20 +1,23 @@
 
 apply plugin: 'retrolambda'
 
-jar {
-	baseName project.projectName
+ext {
+    signModule = true
 }
 
+archivesBaseName = project.projectName
+
 dependencies {
     testCompile dependencyJunit
 }
 
+performSigning(signingEnabled, signModule)
+configureUpload(signingEnabled, signModule)
+
+uploadArchives.enabled = true
 
 retrolambda {
     jdk System.getenv("JAVA8_HOME")
     oldJdk System.getenv("JAVA7_HOME")
     javaVersion JavaVersion.VERSION_1_7
 }
-
-uploadArchives.enabled = true
-
diff --git a/java8/build.gradle b/java8/build.gradle
@@ -1,13 +1,16 @@
 
-jar {
-    baseName "${project.projectName}-${project.name}"
-}
+archivesBaseName = "${project.projectName}-${project.name}"
 
+ext {
+    signModule = true
+}
 
 dependencies {
     compile project(":core")
     testCompile dependencyJunit
 }
 
+performSigning(signingEnabled, signModule)
+configureUpload(signingEnabled, signModule)
 
 uploadArchives.enabled = true
diff --git a/lib.gradle b/lib.gradle
@@ -18,6 +18,68 @@ String findJavaCommand(String command) {
     findCommand("$jh/bin", command)
 }
 
+Boolean doSigning(String signingAllowed, Boolean doModule) {
+    def b = signingAllowed.trim() == "true" && doModule
+    println("signModule: ${project.name} signingEnabled: $signingAllowed module: $doModule")
+    b
+}
+
+void performSigning(String signingAllowed, Boolean doModule) {
+    signing {
+        required { doSigning(signingEnabled, signModule) }
+        sign configurations.archives
+    }
+}
+
+void configureUpload(String signingEnabled, Boolean signModule) {
+
+    uploadArchives {
+        enabled = false
+        repositories {
+            mavenDeployer {
+                if (doSigning(signingEnabled, signModule)) {
+                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+                }
+
+                repository(url: sonatypeUploadUrl) {
+                    authentication(userName: sonatypeUsername, password: sonatypePassword)
+                }
+                pom {
+                    groupId = project.group
+                    project {
+                        name pomProjectName
+                        packaging 'jar'
+                        description projectDescription
+                        url projectUrl
+                        organization {
+                            name pomOrganisation
+                            url projectUrl
+                        }
+                        scm {
+                            url scmUrl
+                        }
+                        licenses {
+                            license {
+                                name "The BSD3 License"
+                                url "https://github.com/functionaljava/functionaljava/blob/master/etc/LICENCE"
+                                distribution 'repo'
+                            }
+                        }
+                        developers {
+                            developer {
+                                email primaryEmail
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
 ext {
     findJavaCommand = this.&findJavaCommand
+    doSigning = this.&doSigning
+    performSigning = this.&performSigning
+    configureUpload = this.&configureUpload
 }
