Update to Gradle 5.1

Author: JLLeitschuh

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew.bat

@@ -145,9 +145,9 @@ subprojects {
     }
 }
 
-val jacocoRootReport = tasks.register("jacocoRootReport", JacocoReport::class.java) {
+val jacocoRootReport = tasks.register<JacocoReport>("jacocoRootReport") {
     group = LifecycleBasePlugin.VERIFICATION_GROUP
-    description = "Generates code coverage report for all sub-projects."
+    description = "Generates an HTML code coverage report for all sub-projects."
 
     val jacocoReportTasks =
         subprojects
@@ -157,24 +157,17 @@ val jacocoRootReport = tasks.register("jacocoRootReport", JacocoReport::class.ja
                 // Otherwise, Jacoco tries to generate coverage data for tests that don't exist
                 !it.java.sourceSets["test"].allSource.isEmpty
             }
-            .map { it.tasks[jacocoTestResultTaskName] as JacocoReport }
+            .map { it.tasks["jacocoTestReport"] as JacocoReport }
             .toList()
     dependsOn(jacocoReportTasks)
 
-    val allExecutionData = jacocoReportTasks.map { it.executionData }
-    executionData(*allExecutionData.toTypedArray())
-
-    // Pre-initialize these to empty collections to prevent NPE on += call below.
-    additionalSourceDirs = files()
-    sourceDirectories = files()
-    classDirectories = files()
+    executionData.setFrom(Callable { jacocoReportTasks.map { it.executionData } })
 
     subprojects.forEach { testedProject ->
         val sourceSets = testedProject.java.sourceSets
-        this@register.additionalSourceDirs =
-            this@register.additionalSourceDirs?.plus(files(sourceSets["main"].allSource.srcDirs))
-        this@register.sourceDirectories += files(sourceSets["main"].allSource.srcDirs)
-        this@register.classDirectories += files(sourceSets["main"].output)
+        val mainSourceSet = sourceSets["main"]
+        this@register.additionalSourceDirs(mainSourceSet.allSource.sourceDirectories)
+        this@register.additionalClassDirs(mainSourceSet.output)
     }
 
     reports {
@@ -202,7 +195,7 @@ tasks.named(LifecycleBasePlugin.CHECK_TASK_NAME).configure {
 
 tasks.withType<Wrapper>().configureEach {
     description = "Configure the version of gradle to download and use"
-    gradleVersion = "4.10.2"
+    gradleVersion = "5.1"
     distributionType = Wrapper.DistributionType.ALL
 }