Merge pull request functionaljava#47 from arichiardi/master

mperry · mperry · commit 199ce363936b · 2014-06-10T10:21:24.000+10:00
Now findJavaCommand in lib.gradle is exposed and it is used by the other .gradle files.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,4 @@
 
-import org.apache.tools.ant.taskdefs.condition.Os
-
 defaultTasks 'build'
 
 Boolean doSigning() {
diff --git a/java8/build.gradle b/java8/build.gradle
@@ -1,6 +1,4 @@
 
-import org.apache.tools.ant.taskdefs.condition.Os
-
 jar {
     baseName "${project.projectName}-${project.name}"
 }
@@ -15,13 +13,8 @@ dependencies {
 }
 
 compileJava {
-    def jh = System.getenv("JAVA8_HOME")
-    if (jh == null) {
-        throw new Exception("JAVA8_HOME environment variable not set")
-    }
-    def extension = Os.isFamily(Os.FAMILY_WINDOWS) ? ".exe" : ""
     options.fork = true
-    options.forkOptions.executable = "$jh$extension/bin/javac"
+    options.forkOptions.executable = findJavaCommand("javac")
 }
 
 uploadArchives.enabled = true
diff --git a/lib.gradle b/lib.gradle
@@ -10,12 +10,12 @@ String findCommand(String dir, String command) {
     cmd
 }
 
-String findJavaCommand(String s) {
+String findJavaCommand(String command) {
     def jh = System.getenv("JAVA8_HOME")
     if (jh == null) {
         throw new Exception("Environment variable JAVA8_HOME not set")
     }
-    findCommand("$jh/bin", s)
+    findCommand("$jh/bin", command)
 }
 
 List<String> projectClasses(List<String> list, String base) {
@@ -36,10 +36,10 @@ def createDynamicJavadoc(String module, List<String> paths) {
 
 ext {
     createDynamicJavadoc = this.&createDynamicJavadoc
+    findJavaCommand = this.&findJavaCommand
 }
 
 task java8Javadoc(type: Exec) {
     def c = findJavaCommand("javadoc")
     commandLine c, "-sourcepath", "$projectDir/src/main/java", "-d", "$buildDir/docs/javadoc", "-subpackages", "fj", "-Xdoclint:none", "-quiet"
-}
-
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`
`2`		`-import org.apache.tools.ant.taskdefs.condition.Os`
`3`		`-`
`4`	`2`	`jar {`
`5`	`3`	`baseName "${project.projectName}-${project.name}"`
`6`	`4`	`}`
`@@ -15,13 +13,8 @@ dependencies {`
`15`	`13`	`}`
`16`	`14`
`17`	`15`	`compileJava {`
`18`		`- def jh = System.getenv("JAVA8_HOME")`
`19`		`- if (jh == null) {`
`20`		`- throw new Exception("JAVA8_HOME environment variable not set")`
`21`		`- }`
`22`		`- def extension = Os.isFamily(Os.FAMILY_WINDOWS) ? ".exe" : ""`
`23`	`16`	`options.fork = true`
`24`		`- options.forkOptions.executable = "$jh$extension/bin/javac"`
	`17`	`+ options.forkOptions.executable = findJavaCommand("javac")`
`25`	`18`	`}`
`26`	`19`
`27`	`20`	`uploadArchives.enabled = true`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,12 @@ String findCommand(String dir, String command) {`
`10`	`10`	`cmd`
`11`	`11`	`}`
`12`	`12`
`13`		`-String findJavaCommand(String s) {`
	`13`	`+String findJavaCommand(String command) {`
`14`	`14`	`def jh = System.getenv("JAVA8_HOME")`
`15`	`15`	`if (jh == null) {`
`16`	`16`	`throw new Exception("Environment variable JAVA8_HOME not set")`
`17`	`17`	`}`
`18`		`- findCommand("$jh/bin", s)`
	`18`	`+ findCommand("$jh/bin", command)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`List<String> projectClasses(List<String> list, String base) {`
`@@ -36,10 +36,10 @@ def createDynamicJavadoc(String module, List<String> paths) {`
`36`	`36`
`37`	`37`	`ext {`
`38`	`38`	`createDynamicJavadoc = this.&createDynamicJavadoc`
	`39`	`+ findJavaCommand = this.&findJavaCommand`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`task java8Javadoc(type: Exec) {`
`42`	`43`	`def c = findJavaCommand("javadoc")`
`43`	`44`	`commandLine c, "-sourcepath", "$projectDir/src/main/java", "-d", "$buildDir/docs/javadoc", "-subpackages", "fj", "-Xdoclint:none", "-quiet"`
`44`		`-}`
`45`		`-`
	`45`	`+}`