Changes to do final release 4.0

mperry · mperry · commit 3403d479f7d9 · 2014-05-29T22:50:54.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -14,12 +14,12 @@ if (JavaVersion.current().isJava8Compatible()) {
 
 allprojects {
 	ext {
-        isSnapshot = true
+        isSnapshot = false
         fjBaseVersion = "4.0"
 
         snapshotAppendix = "-SNAPSHOT"
 		fjVersion = fjBaseVersion + (isSnapshot ? snapshotAppendix : "")
-        fjConsumeVersion = fjVersion
+        fjConsumeVersion = "$fjBaseVersion$snapshotAppendix"
 
         projectTitle = "Functional Java"
 		projectName = "functionaljava"
diff --git a/core/build.gradle b/core/build.gradle
@@ -22,11 +22,41 @@ dependencies {
     testCompile "junit:junit:4.11"
 }
 
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from "build/docs/javadoc"
+}
+
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allSource
+    classifier = 'sources'
+}
+
+artifacts {
+    archives jar
+    archives javadocJar
+    archives sourcesJar
+}
+
+Boolean doSigning() {
+    signingEnabled.trim() == "true"
+}
+
+if (doSigning()) {
+    apply plugin: "signing"
+    signing {
+       sign configurations.archives
+    }
+}
+
 uploadArchives {
     repositories {
         mavenDeployer {
-            // used for signing the artifacts, no need to sign snapshot, so leave out for now
-//            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+            if (doSigning()) {
+                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+            }
 
             repository(url: sonatypeUploadUrl) {
                 authentication(userName: sonatypeUsername, password: sonatypePassword)
