Consolidate common gradle code

Mark Perry · Mark Perry · commit c502854bc6c5 · 2014-06-05T16:49:12.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -70,7 +70,7 @@ subprojects {
         mavenCentral()
     }
 
-//    apply from: "$rootDir/lib.gradle"
+    apply from: "$rootDir/lib.gradle"
     apply plugin: "maven"
     apply plugin: "java"
 
diff --git a/core/build.gradle b/core/build.gradle
@@ -1,8 +1,6 @@
 
 apply plugin: 'retrolambda'
 
-apply from: "$rootDir/lib.gradle"
-
 jar {
 	baseName project.projectName
 }
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -2,13 +2,10 @@
 apply plugin: 'application'
 apply plugin: 'retrolambda'
 
-apply from: "$rootDir/lib.gradle"
-
 mainClassName = "fj.demo.euler.Problem2"
 
 task javadoc(type: Javadoc, overwrite: true) {
-    def t = createDynamicJavadoc("$projectDir", ["core"])
-    dependsOn(t)
+    dependsOn(createDynamicJavadoc("$projectDir", ["core"]))
 }
 
 retrolambda {
diff --git a/java8/build.gradle b/java8/build.gradle
@@ -1,15 +1,12 @@
 
 import org.apache.tools.ant.taskdefs.condition.Os
 
-apply from: "$rootDir/lib.gradle"
-
 jar {
     baseName "${project.projectName}-${project.name}"
 }
 
 task javadoc(type: Javadoc, overwrite: true) {
-    def t = createDynamicJavadoc("$projectDir", ["core"])
-    dependsOn(t)
+    dependsOn(createDynamicJavadoc("$projectDir", ["core"]))
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ subprojects {`
`70`	`70`	`mavenCentral()`
`71`	`71`	`}`
`72`	`72`
`73`		`-// apply from: "$rootDir/lib.gradle"`
	`73`	`+ apply from: "$rootDir/lib.gradle"`
`74`	`74`	`apply plugin: "maven"`
`75`	`75`	`apply plugin: "java"`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`
`2`	`2`	`apply plugin: 'retrolambda'`
`3`	`3`
`4`		`-apply from: "$rootDir/lib.gradle"`
`5`		`-`
`6`	`4`	`jar {`
`7`	`5`	`baseName project.projectName`
`8`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,12 @@`
`1`	`1`
`2`	`2`	`import org.apache.tools.ant.taskdefs.condition.Os`
`3`	`3`
`4`		`-apply from: "$rootDir/lib.gradle"`
`5`		`-`
`6`	`4`	`jar {`
`7`	`5`	`baseName "${project.projectName}-${project.name}"`
`8`	`6`	`}`
`9`	`7`
`10`	`8`	`task javadoc(type: Javadoc, overwrite: true) {`
`11`		`- def t = createDynamicJavadoc("$projectDir", ["core"])`
`12`		`- dependsOn(t)`
	`9`	`+ dependsOn(createDynamicJavadoc("$projectDir", ["core"]))`
`13`	`10`	`}`
`14`	`11`
`15`	`12`	`dependencies {`