Added java8 module to be published

Mark Perry · Mark Perry · commit 263d2edfb3e9 · 2014-06-05T13:12:12.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,11 @@ import org.apache.tools.ant.taskdefs.condition.Os
 
 defaultTasks 'build'
 
+Boolean doSigning() {
+    signingEnabled.trim() == "true"
+}
+
+
 ext {
 }
 
@@ -47,8 +52,58 @@ allprojects {
 }
 
 subprojects {
+    apply plugin: "maven"
 
+    if (doSigning()) {
+        apply plugin: "signing"
+        signing {
+            sign configurations.archives
+        }
+    }
 
-
+    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
+//                        connection scmGitFile
+//                        developerConnection scmGitFile
+                        }
+                        licenses {
+                            license {
+                                name "The BSD3 License"
+                                url "https://github.com/functionaljava/functionaljava/blob/master/etc/LICENCE"
+                                distribution 'repo'
+                            }
+                        }
+                        developers {
+                            developer {
+                                email primaryEmail
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 
 }
diff --git a/core/build.gradle b/core/build.gradle
@@ -72,46 +72,5 @@ if (doSigning()) {
     }
 }
 
-uploadArchives {
-    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
-//                        connection scmGitFile
-//                        developerConnection scmGitFile
-                    }
-                    licenses {
-                        license {
-                            name "The BSD3 License"
-                            url "https://github.com/functionaljava/functionaljava/blob/master/etc/LICENCE"
-                            distribution 'repo'
-                        }
-                    }
-                    developers {
-                        developer {
-                            email primaryEmail
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
+uploadArchives.enabled = true
+
diff --git a/java8/build.gradle b/java8/build.gradle
@@ -11,6 +11,11 @@ repositories {
     mavenCentral()
 }
 
+jar {
+    baseName "${project.projectName}-${project.name}"
+    version project.fjVersion
+}
+
 task javadoc(type: Javadoc, overwrite: true) {
     def t = createDynamicJavadoc("$projectDir", ["core"])
     dependsOn(t)
@@ -31,3 +36,4 @@ compileJava {
     options.forkOptions.executable = "$jh$extension/bin/javac"
 }
 
+uploadArchives.enabled = true

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,11 @@ repositories {`
`11`	`11`	`mavenCentral()`
`12`	`12`	`}`
`13`	`13`
	`14`	`+jar {`
	`15`	`+ baseName "${project.projectName}-${project.name}"`
	`16`	`+ version project.fjVersion`
	`17`	`+}`
	`18`	`+`
`14`	`19`	`task javadoc(type: Javadoc, overwrite: true) {`
`15`	`20`	`def t = createDynamicJavadoc("$projectDir", ["core"])`
`16`	`21`	`dependsOn(t)`
`@@ -31,3 +36,4 @@ compileJava {`
`31`	`36`	`options.forkOptions.executable = "$jh$extension/bin/javac"`
`32`	`37`	`}`
`33`	`38`
	`39`	`+uploadArchives.enabled = true`