Publish java8 module

Mark Perry · Mark Perry · commit cc2b403434e4 · 2014-06-05T14:26:22.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -52,7 +52,26 @@ allprojects {
 }
 
 subprojects {
+
+    defaultTasks "build"
+
+    buildscript {
+        repositories {
+            mavenCentral()
+        }
+
+        dependencies {
+            classpath 'me.tatarka:gradle-retrolambda:1.3.1'
+        }
+    }
+
+    repositories {
+        mavenCentral()
+    }
+
+
     apply plugin: "maven"
+    apply plugin: "java"
 
     if (doSigning()) {
         apply plugin: "signing"
@@ -61,6 +80,30 @@ subprojects {
         }
     }
 
+    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
+    }
+
+    jar {
+        version project.fjVersion
+        manifest {
+            attributes 'Signature-Version': project.fjVersion
+        }
+    }
+
+
     uploadArchives {
         enabled = false
         repositories {
diff --git a/core/build.gradle b/core/build.gradle
@@ -1,41 +1,18 @@
 
-
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'me.tatarka:gradle-retrolambda:1.3.1'
-    }
-}
-
-apply plugin: 'java'
-apply plugin: 'maven'
-//apply plugin: 'signing'
 apply plugin: 'retrolambda'
 
 apply from: "$rootDir/lib.gradle"
 
-defaultTasks 'build'
-
 jar {
 	baseName project.projectName
-	version project.fjVersion
-	manifest {
-		attributes 'Signature-Version': project.fjVersion
-	}
-}
-
-repositories {
-    mavenCentral()
 }
 
 dependencies {
     compile 'org.slf4j:slf4j-api:1.7.5'
     testCompile "junit:junit:4.11"
 }
 
+//tasks["javadoc"].dependsOn("java8Javadoc")
 task javadoc(type: Javadoc, overwrite: true, dependsOn: "java8Javadoc") {
 }
 
@@ -45,32 +22,24 @@ retrolambda {
     javaVersion JavaVersion.VERSION_1_7
 }
 
-task javadocJar(type: Jar, dependsOn: java8Javadoc) {
-    classifier = 'javadoc'
-    from "build/docs/javadoc"
-}
-
-task sourcesJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier = 'sources'
-}
+//project.tasks['javadocJar'].dependsOn(javadoc)
 
-artifacts {
-    archives jar
-    archives javadocJar
-    archives sourcesJar
-}
+//task javadocJar(type: Jar, dependsOn: java8Javadoc) {
+//    classifier = 'javadoc'
+//    from "build/docs/javadoc"
+//}
 
-Boolean doSigning() {
-    signingEnabled.trim() == "true"
-}
 
-if (doSigning()) {
-    apply plugin: "signing"
-    signing {
-       sign configurations.archives
-    }
-}
+//Boolean doSigning() {
+//    signingEnabled.trim() == "true"
+//}
+//
+//if (doSigning()) {
+//    apply plugin: "signing"
+//    signing {
+//       sign configurations.archives
+//    }
+//}
 
 uploadArchives.enabled = true
 
diff --git a/java8/build.gradle b/java8/build.gradle
@@ -13,7 +13,6 @@ repositories {
 
 jar {
     baseName "${project.projectName}-${project.name}"
-    version project.fjVersion
 }
 
 task javadoc(type: Javadoc, overwrite: true) {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ repositories {`
`13`	`13`
`14`	`14`	`jar {`
`15`	`15`	`baseName "${project.projectName}-${project.name}"`
`16`		`- version project.fjVersion`
`17`	`16`	`}`
`18`	`17`
`19`	`18`	`task javadoc(type: Javadoc, overwrite: true) {`