Skip to content

Commit d747ac5

Browse files
author
Brendan Doyle
committed
fix scoverage resolution
1 parent 26fee6a commit d747ac5

File tree

7 files changed

+36
-0
lines changed

7 files changed

+36
-0
lines changed

core/controller/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar'
2929

3030
project.archivesBaseName = "openwhisk-controller"
3131

32+
scoverage {
33+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
34+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
35+
}
36+
3237
ext.coverageDirs = [
3338
"${buildDir}/classes/scala/scoverage",
3439
"${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage"

core/cosmosdb/cache-invalidator/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar'
2929

3030
project.archivesBaseName = "openwhisk-cache-invalidator-cosmosdb"
3131

32+
scoverage {
33+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
34+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
35+
}
36+
3237
dependencies {
3338
implementation "org.scala-lang:scala-library:${gradle.scala.version}"
3439
implementation (project(':common:scala')) {

core/invoker/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ apply from: '../../gradle/docker.gradle'
2828
distDocker.dependsOn ':common:scala:distDocker', 'distTar'
2929

3030
project.archivesBaseName = "openwhisk-invoker"
31+
32+
scoverage {
33+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
34+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
35+
}
36+
3137
ext.coverageDirs = [
3238
"${buildDir}/classes/scala/scoverage",
3339
"${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage"

core/monitoring/user-events/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar'
2929

3030
project.archivesBaseName = "openwhisk-user-events"
3131

32+
scoverage {
33+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
34+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
35+
}
36+
3237
dependencies {
3338
implementation "org.scala-lang:scala-library:${gradle.scala.version}"
3439
implementation project(':common:scala')

core/scheduler/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar'
2828

2929
project.archivesBaseName = "openwhisk-scheduler"
3030

31+
scoverage {
32+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
33+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
34+
}
35+
3136
ext.coverageDirs = [
3237
"${buildDir}/classes/scala/scoverage",
3338
"${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage"

core/standalone/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ distDocker.dependsOn 'bootJar'
3232

3333
project.archivesBaseName = "openwhisk-standalone"
3434

35+
scoverage {
36+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
37+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
38+
}
39+
3540
task copySwagger(type: Copy) {
3641
def version = "3.6.0"
3742
mkdir("$buildDir/tmp/swagger")

tests/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ install.dependsOn ':tools:admin:install'
3232

3333
project.archivesBaseName = "openwhisk-tests"
3434

35+
scoverage {
36+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
37+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
38+
}
39+
3540
def leanExcludes = [
3641
'**/MaxActionDurationTests*',
3742
'invokerShoot/**'

0 commit comments

Comments
 (0)