Update gradle. Fix gradle warnings.

jbgi · jbgi · commit 4c93bae8c233 · 2018-10-08T10:12:47.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -21,6 +21,11 @@ buildscript {
         classpath "com.ofg:uptodate-gradle-plugin:$uptodateVersion"
         classpath "me.tatarka:gradle-retrolambda:$retrolambdaPluginVersion"
     }
+
+    wrapper {
+        gradleVersion = "4.10.2"
+        distributionType = Wrapper.DistributionType.ALL
+    }
 }
 
 if (JavaVersion.current().isJava8Compatible()) {
@@ -117,23 +122,10 @@ subprojects {
 		}
 	}
 
-    jacocoTestReport {
-        additionalSourceDirs = files(sourceSets.main.allSource.srcDirs)
-        sourceDirectories = files(sourceSets.main.allSource.srcDirs)
-        classDirectories =  files(sourceSets.main.output)
-        reports {
-            html.enabled = true
-            xml.enabled = true
-            csv.enabled = false
-        }
-    }
-
-    task coverage(dependsOn: ["test", "jacocoTestReport"]) << {}
-
 }
 
 task coverage(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
-    dependsOn = subprojects.coverage
+    dependsOn = subprojects*.test
     executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec")
     // We only care about coverage of:
     def projectForFoverage = ["core", "java8", "quickcheck", "java-core"]
@@ -192,14 +184,14 @@ configure(subprojects.findAll { it.name != "props-core" }) {
     }
 
     // Output MANIFEST.MF statically so eclipse can see it for plugin development
-    task eclipsePluginManifest(dependsOn: jar) << {
+    task eclipsePluginManifest(dependsOn: jar) doLast {
       file("META-INF").mkdirs()
       jar.manifest.writeTo(file("META-INF/MANIFEST.MF"))
     }
 
     eclipseProject.dependsOn eclipsePluginManifest
 }
 
-task env << {
+task env doLast {
 	println System.getenv()
 }
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
@@ -1,6 +1,5 @@
-#Sat Aug 25 14:20:05 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,11 @@ buildscript {`
`21`	`21`	`classpath "com.ofg:uptodate-gradle-plugin:$uptodateVersion"`
`22`	`22`	`classpath "me.tatarka:gradle-retrolambda:$retrolambdaPluginVersion"`
`23`	`23`	`}`
	`24`	`+`
	`25`	`+ wrapper {`
	`26`	`+ gradleVersion = "4.10.2"`
	`27`	`+ distributionType = Wrapper.DistributionType.ALL`
	`28`	`+ }`
`24`	`29`	`}`
`25`	`30`
`26`	`31`	`if (JavaVersion.current().isJava8Compatible()) {`
`@@ -117,23 +122,10 @@ subprojects {`
`117`	`122`	`}`
`118`	`123`	`}`
`119`	`124`
`120`		`- jacocoTestReport {`
`121`		`- additionalSourceDirs = files(sourceSets.main.allSource.srcDirs)`
`122`		`- sourceDirectories = files(sourceSets.main.allSource.srcDirs)`
`123`		`- classDirectories = files(sourceSets.main.output)`
`124`		`- reports {`
`125`		`- html.enabled = true`
`126`		`- xml.enabled = true`
`127`		`- csv.enabled = false`
`128`		`- }`
`129`		`- }`
`130`		`-`
`131`		`- task coverage(dependsOn: ["test", "jacocoTestReport"]) << {}`
`132`		`-`
`133`	`125`	`}`
`134`	`126`
`135`	`127`	`task coverage(type: org.gradle.testing.jacoco.tasks.JacocoReport) {`
`136`		`- dependsOn = subprojects.coverage`
	`128`	`+ dependsOn = subprojects*.test`
`137`	`129`	`executionData fileTree(project.rootDir.absolutePath).include("*/build/jacoco/.exec")`
`138`	`130`	`// We only care about coverage of:`
`139`	`131`	`def projectForFoverage = ["core", "java8", "quickcheck", "java-core"]`
`@@ -192,14 +184,14 @@ configure(subprojects.findAll { it.name != "props-core" }) {`
`192`	`184`	`}`
`193`	`185`
`194`	`186`	`// Output MANIFEST.MF statically so eclipse can see it for plugin development`
`195`		`- task eclipsePluginManifest(dependsOn: jar) << {`
	`187`	`+ task eclipsePluginManifest(dependsOn: jar) doLast {`
`196`	`188`	`file("META-INF").mkdirs()`
`197`	`189`	`jar.manifest.writeTo(file("META-INF/MANIFEST.MF"))`
`198`	`190`	`}`
`199`	`191`
`200`	`192`	`eclipseProject.dependsOn eclipsePluginManifest`
`201`	`193`	`}`
`202`	`194`
`203`		`-task env << {`
	`195`	`+task env doLast {`
`204`	`196`	`println System.getenv()`
`205`	`197`	`}`