[GitHub] chetanmeh closed pull request #3802: Bump gradle and scoverage version, adjust scoverage plumbing.

[GitBox <gi...@apache.org>]

chetanmeh closed pull request #3802: Bump gradle and scoverage version, adjust scoverage plumbing.
URL: https://github.com/apache/incubator-openwhisk/pull/3802
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/build.gradle b/build.gradle
index ee49762403..47069ef173 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,12 +21,12 @@ buildscript {
     }
     dependencies {
         classpath "cz.alenkacz:gradle-scalafmt:${gradle.scalafmt.version}"
-        classpath 'org.scoverage:gradle-scoverage:2.1.0'
+        classpath 'org.scoverage:gradle-scoverage:2.3.0'
     }
 }
 
 plugins {
-    id "com.gradle.build-scan" version "1.12.1"
+    id "com.gradle.build-scan" version "1.14"
 }
 
 buildScan {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7a3265ee94..758de960ec 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d7cc33fe99..0178d895c7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,6 +3,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
diff --git a/tests/build.gradle b/tests/build.gradle
index 266dc31c50..50847fc659 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -169,8 +169,13 @@ task createKeystore(dependsOn: deleteKeystore) {
     }
 }
 
-afterEvaluate {
-    task testCoverageLean(type:Test) {
+tasks.withType(Test) {
+    dependsOn createKeystore
+}
+createKeystore.mustRunAfter(testClasses)
+
+gradle.projectsEvaluated {
+    task testCoverageLean(type: Test) {
         doFirst {
             logTestSetInfo()
         }
@@ -179,12 +184,9 @@ afterEvaluate {
         include getPattern(testSetName, "includes")
     }
 
-    task testCoverage(type:Test) {
+    task testCoverage(type: Test) {
         classpath = getScoverageClasspath(project)
     }
-    tasks.withType(Test) {
-        dependsOn createKeystore
-    }
 }
 
 /**
@@ -228,7 +230,7 @@ def getScoverageClasspath(Project project) {
         ':core:controller',
         ':core:invoker'
     ]
-    def combinedClasspath = projectNames.inject(project.files([])){result, name ->
+    def combinedClasspath = projectNames.inject(project.files([])) { result, name ->
         result + project.project(name).sourceSets.scoverage.runtimeClasspath
     }
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services