Merge branch 'gradle2'

mperry · mperry · commit 4db435f4c3e4 · 2014-07-01T21:44:42.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -75,6 +75,8 @@ subprojects {
     apply plugin: "maven"
     apply plugin: "java"
 
+    sourceCompatibility = "1.7"
+
     if (doSigning()) {
         apply plugin: "signing"
         signing {
@@ -149,3 +151,7 @@ subprojects {
     }
 
 }
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.0'
+}
diff --git a/core/build.gradle b/core/build.gradle
@@ -9,8 +9,7 @@ dependencies {
     testCompile dependencyJunit
 }
 
-task javadoc(type: Javadoc, overwrite: true, dependsOn: "java8Javadoc") {
-}
+sourceCompatibility = "1.8"
 
 retrolambda {
     jdk System.getenv("JAVA8_HOME")
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -4,9 +4,7 @@ apply plugin: 'retrolambda'
 
 mainClassName = "fj.demo.euler.Problem2"
 
-task javadoc(type: Javadoc, overwrite: true) {
-    dependsOn(createDynamicJavadoc("$projectDir", ["core"]))
-}
+sourceCompatibility = "1.8"
 
 retrolambda {
     jdk System.getenv("JAVA8_HOME")
diff --git a/demo/src/main/java/fj/demo/concurrent/WordCount.java b/demo/src/main/java/fj/demo/concurrent/WordCount.java
@@ -34,8 +34,8 @@
 import fj.data.Iteratee.IterV;
 
 /**
- * Reads words and their counts from files ({@link #getWordsAndCountsFromFiles(List)} in a single thread
- * and {@link #getWordsAndCountsFromFilesInParallel(List, int)} in multiple threads). The files are created
+ * Reads words and their counts from files ({@link #getWordsAndCountsFromFiles} in a single thread
+ * and {@link #getWordsAndCountsFromFilesInParallel} in multiple threads). The files are created
  * initially and populated with some sample content.
  * 
  * @author Martin Grotzke
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+#Tue Jun 10 12:02:45 EST 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+#distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/java8/build.gradle b/java8/build.gradle
@@ -3,18 +3,12 @@ jar {
     baseName "${project.projectName}-${project.name}"
 }
 
-task javadoc(type: Javadoc, overwrite: true) {
-    dependsOn(createDynamicJavadoc("$projectDir", ["core"]))
-}
+sourceCompatibility = "1.8"
 
 dependencies {
     compile project(":core")
     testCompile dependencyJunit
 }
 
-compileJava {
-    options.fork = true
-    options.forkOptions.executable = findJavaCommand("javac")
-}
 
 uploadArchives.enabled = true
diff --git a/settings.gradle b/settings.gradle
@@ -2,6 +2,4 @@
 rootProject.name = "functionaljava"
 
 include 'core', 'demo', "tests", "consume", "java8"
-// The final Java 8 release, (build 1.8.0-b132) does not work with Gradle and the Scala plugin
-// see http://issues.gradle.org/browse/GRADLE-3023
 

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,8 @@ subprojects {`
`75`	`75`	`apply plugin: "maven"`
`76`	`76`	`apply plugin: "java"`
`77`	`77`
	`78`	`+ sourceCompatibility = "1.7"`
	`79`	`+`
`78`	`80`	`if (doSigning()) {`
`79`	`81`	`apply plugin: "signing"`
`80`	`82`	`signing {`
`@@ -149,3 +151,7 @@ subprojects {`
`149`	`151`	`}`
`150`	`152`
`151`	`153`	`}`
	`154`	`+`
	`155`	`+task wrapper(type: Wrapper) {`
	`156`	`+ gradleVersion = '2.0'`
	`157`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@ dependencies {`
`9`	`9`	`testCompile dependencyJunit`
`10`	`10`	`}`
`11`	`11`
`12`		`-task javadoc(type: Javadoc, overwrite: true, dependsOn: "java8Javadoc") {`
`13`		`-}`
	`12`	`+sourceCompatibility = "1.8"`
`14`	`13`
`15`	`14`	`retrolambda {`
`16`	`15`	`jdk System.getenv("JAVA8_HOME")`