Clean common gradle functionality

Mark Perry · Mark Perry · commit 10f434dfcad1 · 2014-06-05T15:35:09.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -70,6 +70,7 @@ subprojects {
         mavenCentral()
     }
 
+//    apply from: "$rootDir/lib.gradle"
     apply plugin: "maven"
     apply plugin: "java"
 
diff --git a/lib.gradle b/lib.gradle
@@ -24,12 +24,12 @@ List<String> projectClasses(List<String> list, String base) {
     }
 }
 
-def createDynamicJavadoc(String mainPath, List<String> paths) {
+def createDynamicJavadoc(String module, List<String> paths) {
     def taskName = "dynamicJava8Javadoc"
     task "$taskName"(type: Exec) {
-        def cp = projectClasses(paths, projectDir).join(";")
+        def cp = projectClasses(paths, "$module/..").join(";")
         def c = findJavaCommand("javadoc")
-        commandLine c, "-sourcepath", "$mainPath/src/main/java", "-d", "$mainPath/build/docs/javadoc", "-subpackages", "fj", "-Xdoclint:none", "-quiet", "-classpath", cp
+        commandLine c, "-sourcepath", "$module/src/main/java", "-d", "$module/build/docs/javadoc", "-subpackages", "fj", "-Xdoclint:none", "-quiet", "-classpath", cp
     }
     project.tasks[taskName]
 }

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ subprojects {`
`70`	`70`	`mavenCentral()`
`71`	`71`	`}`
`72`	`72`
	`73`	`+// apply from: "$rootDir/lib.gradle"`
`73`	`74`	`apply plugin: "maven"`
`74`	`75`	`apply plugin: "java"`
`75`	`76`
Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ List<String> projectClasses(List<String> list, String base) {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`-def createDynamicJavadoc(String mainPath, List<String> paths) {`
	`27`	`+def createDynamicJavadoc(String module, List<String> paths) {`
`28`	`28`	`def taskName = "dynamicJava8Javadoc"`
`29`	`29`	`task "$taskName"(type: Exec) {`
`30`		`- def cp = projectClasses(paths, projectDir).join(";")`
	`30`	`+ def cp = projectClasses(paths, "$module/..").join(";")`
`31`	`31`	`def c = findJavaCommand("javadoc")`
`32`		`- commandLine c, "-sourcepath", "$mainPath/src/main/java", "-d", "$mainPath/build/docs/javadoc", "-subpackages", "fj", "-Xdoclint:none", "-quiet", "-classpath", cp`
	`32`	`+ commandLine c, "-sourcepath", "$module/src/main/java", "-d", "$module/build/docs/javadoc", "-subpackages", "fj", "-Xdoclint:none", "-quiet", "-classpath", cp`
`33`	`33`	`}`
`34`	`34`	`project.tasks[taskName]`
`35`	`35`	`}`