[incubator-openwhisk] branch master updated: Bump gradle and scoverage version (#3802)

[chetanm]

This is an automated email from the ASF dual-hosted git repository.

chetanm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 76dadd2  Bump gradle and scoverage version (#3802)
76dadd2 is described below

commit 76dadd247812af45e636a67ba96df5fc5f25890e
Author: Markus Thömmes <markusthoem...@me.com>
AuthorDate: Mon Jun 25 14:00:43 2018 +0200

    Bump gradle and scoverage version (#3802)
    
    Switch to Gradle version 4.8.1 and adapt build scripts to use 
`gradle.projectsEvaluated`  instead of `afterEvaluate`.
    
    Also bump the following plugin versions
    
    - gradle-scoverage - 2.1.0 -> 2.3.0
    - com.gradle.build-scan - 1.12.1 -> 1.14
---
 build.gradle                             |   4 ++--
 gradle/wrapper/gradle-wrapper.jar        | Bin 54708 -> 54417 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 tests/build.gradle                       |  16 +++++++++-------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index ee49762..47069ef 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 7a3265e..758de96 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 d7cc33f..0178d89 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 266dc31..50847fc 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
     }