Clean up javadoc related production

Mark Perry · Mark Perry · commit e7a895305cfd · 2014-06-03T16:09:53.000+10:00
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -28,7 +28,6 @@ repositories {
     mavenCentral()
 }
 
-//task javadoc(type: Javadoc, overwrite: true, dependsOn: "java8Javadoc") {
 task javadoc(type: Javadoc, overwrite: true) {
     def t = createDynamicJavadoc("$projectDir", ["core"])
     dependsOn(t)
diff --git a/java8/build.gradle b/java8/build.gradle
@@ -20,12 +20,8 @@ repositories {
     mavenCentral()
 }
 
-//task javadoc(type: Javadoc, overwrite: true, dependsOn: "java8Javadoc") {
-//}
-
 task javadoc(type: Javadoc, overwrite: true) {
     def t = createDynamicJavadoc("$projectDir", ["core"])
-//    dependsOn(":$t.name")
     dependsOn(t)
 }
 
@@ -36,7 +32,6 @@ retrolambda {
 }
 
 dependencies {
-//    compile 'org.slf4j:slf4j-api:1.7.5'
     compile project(":core")
 
     testCompile "junit:junit:4.11"
diff --git a/lib.gradle b/lib.gradle
@@ -1,15 +1,13 @@
 
 import org.apache.tools.ant.taskdefs.condition.Os
 
-
 String findCommand(String dir, String command) {
     def extension = Os.isFamily(Os.FAMILY_WINDOWS) ? ".exe" : ""
     def cmd = "$dir/$command$extension"
     if (! new File(cmd).exists()) {
         throw new Exception("Command $command not found in dir $dir")
     }
     cmd
-
 }
 
 String findJavaCommand(String s) {
@@ -22,7 +20,6 @@ String findJavaCommand(String s) {
 
 List<String> projectClasses(List<String> list) {
     list.collect {
-//        "$projectDir/../$it/src/main/java"
         "$projectDir/../$it/build/classes/main"
     }
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ repositories {`
`28`	`28`	`mavenCentral()`
`29`	`29`	`}`
`30`	`30`
`31`		`-//task javadoc(type: Javadoc, overwrite: true, dependsOn: "java8Javadoc") {`
`32`	`31`	`task javadoc(type: Javadoc, overwrite: true) {`
`33`	`32`	`def t = createDynamicJavadoc("$projectDir", ["core"])`
`34`	`33`	`dependsOn(t)`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,8 @@ repositories {`
`20`	`20`	`mavenCentral()`
`21`	`21`	`}`
`22`	`22`
`23`		`-//task javadoc(type: Javadoc, overwrite: true, dependsOn: "java8Javadoc") {`
`24`		`-//}`
`25`		`-`
`26`	`23`	`task javadoc(type: Javadoc, overwrite: true) {`
`27`	`24`	`def t = createDynamicJavadoc("$projectDir", ["core"])`
`28`		`-// dependsOn(":$t.name")`
`29`	`25`	`dependsOn(t)`
`30`	`26`	`}`
`31`	`27`
`@@ -36,7 +32,6 @@ retrolambda {`
`36`	`32`	`}`
`37`	`33`
`38`	`34`	`dependencies {`
`39`		`-// compile 'org.slf4j:slf4j-api:1.7.5'`
`40`	`35`	`compile project(":core")`
`41`	`36`
`42`	`37`	`testCompile "junit:junit:4.11"`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,13 @@`
`1`	`1`
`2`	`2`	`import org.apache.tools.ant.taskdefs.condition.Os`
`3`	`3`
`4`		`-`
`5`	`4`	`String findCommand(String dir, String command) {`
`6`	`5`	`def extension = Os.isFamily(Os.FAMILY_WINDOWS) ? ".exe" : ""`
`7`	`6`	`def cmd = "$dir/$command$extension"`
`8`	`7`	`if (! new File(cmd).exists()) {`
`9`	`8`	`throw new Exception("Command $command not found in dir $dir")`
`10`	`9`	`}`
`11`	`10`	`cmd`
`12`		`-`
`13`	`11`	`}`
`14`	`12`
`15`	`13`	`String findJavaCommand(String s) {`
`@@ -22,7 +20,6 @@ String findJavaCommand(String s) {`
`22`	`20`
`23`	`21`	`List<String> projectClasses(List<String> list) {`
`24`	`22`	`list.collect {`
`25`		`-// "$projectDir/../$it/src/main/java"`
`26`	`23`	`"$projectDir/../$it/build/classes/main"`
`27`	`24`	`}`
`28`	`25`