Update gradle. Fix gradle warnings.

jbgi · jbgi · commit 59eacc4dceb3 · 2018-10-07T22:00:35.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -18,6 +18,11 @@ buildscript {
     dependencies {
         classpath "com.ofg:uptodate-gradle-plugin:$uptodateVersion"
     }
+
+    wrapper {
+        gradleVersion = "4.10.2"
+        distributionType = Wrapper.DistributionType.ALL
+    }
 }
 
 if (JavaVersion.current().isJava8Compatible()) {
@@ -111,23 +116,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", "quickcheck", "java-core"]
@@ -186,14 +178,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
`@@ -18,6 +18,11 @@ buildscript {`
`18`	`18`	`dependencies {`
`19`	`19`	`classpath "com.ofg:uptodate-gradle-plugin:$uptodateVersion"`
`20`	`20`	`}`
	`21`	`+`
	`22`	`+ wrapper {`
	`23`	`+ gradleVersion = "4.10.2"`
	`24`	`+ distributionType = Wrapper.DistributionType.ALL`
	`25`	`+ }`
`21`	`26`	`}`
`22`	`27`
`23`	`28`	`if (JavaVersion.current().isJava8Compatible()) {`
`@@ -111,23 +116,10 @@ subprojects {`
`111`	`116`	`}`
`112`	`117`	`}`
`113`	`118`
`114`		`- jacocoTestReport {`
`115`		`- additionalSourceDirs = files(sourceSets.main.allSource.srcDirs)`
`116`		`- sourceDirectories = files(sourceSets.main.allSource.srcDirs)`
`117`		`- classDirectories = files(sourceSets.main.output)`
`118`		`- reports {`
`119`		`- html.enabled = true`
`120`		`- xml.enabled = true`
`121`		`- csv.enabled = false`
`122`		`- }`
`123`		`- }`
`124`		`-`
`125`		`- task coverage(dependsOn: ["test", "jacocoTestReport"]) << {}`
`126`		`-`
`127`	`119`	`}`
`128`	`120`
`129`	`121`	`task coverage(type: org.gradle.testing.jacoco.tasks.JacocoReport) {`
`130`		`- dependsOn = subprojects.coverage`
	`122`	`+ dependsOn = subprojects*.test`
`131`	`123`	`executionData fileTree(project.rootDir.absolutePath).include("*/build/jacoco/.exec")`
`132`	`124`	`// We only care about coverage of:`
`133`	`125`	`def projectForFoverage = ["core", "quickcheck", "java-core"]`
`@@ -186,14 +178,14 @@ configure(subprojects.findAll { it.name != "props-core" }) {`
`186`	`178`	`}`
`187`	`179`
`188`	`180`	`// Output MANIFEST.MF statically so eclipse can see it for plugin development`
`189`		`- task eclipsePluginManifest(dependsOn: jar) << {`
	`181`	`+ task eclipsePluginManifest(dependsOn: jar) doLast {`
`190`	`182`	`file("META-INF").mkdirs()`
`191`	`183`	`jar.manifest.writeTo(file("META-INF/MANIFEST.MF"))`
`192`	`184`	`}`
`193`	`185`
`194`	`186`	`eclipseProject.dependsOn eclipsePluginManifest`
`195`	`187`	`}`
`196`	`188`
`197`		`-task env << {`
	`189`	`+task env doLast {`
`198`	`190`	`println System.getenv()`
`199`	`191`	`}`