From 5562ed7bf6bc73c2ae6b20172f76b27c0ba0fc0e Mon Sep 17 00:00:00 2001 From: Stu Date: Thu, 4 Dec 2014 21:55:55 +0000 Subject: [PATCH 1/2] only append scalac options if there are excluded packages --- src/main/groovy/org/scoverage/ScoverageExtension.groovy | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/groovy/org/scoverage/ScoverageExtension.groovy b/src/main/groovy/org/scoverage/ScoverageExtension.groovy index 5e600b4..10e96a0 100644 --- a/src/main/groovy/org/scoverage/ScoverageExtension.groovy +++ b/src/main/groovy/org/scoverage/ScoverageExtension.groovy @@ -24,8 +24,8 @@ class ScoverageExtension { File sources /** range positioning for highlighting */ boolean highlighting = true - /** regex of excluded packages, separated by semicolons */ - String excludedPackages = "" + /** regex for each excluded package */ + List excludedPackages = [] ScoverageExtension(Project project) { @@ -87,7 +87,9 @@ class ScoverageExtension { plugin.addAll(parameters) } plugin.add("-P:scoverage:dataDir:${extension.dataDir.absolutePath}".toString()) - plugin.add("-P:scoverage:excludedPackages:${extension.excludedPackages}".toString()) + if (extension.excludedPackages) { + plugin.add("-P:scoverage:excludedPackages:${extension.excludedPackages.join(';')}".toString()) + } if (extension.highlighting) { plugin.add('-Yrangepos') } From 646df8e47c6b72d5c857b436a4ba7ddddeff5202 Mon Sep 17 00:00:00 2001 From: Stu Date: Thu, 4 Dec 2014 21:57:43 +0000 Subject: [PATCH 2/2] support 'excludedFiles' option for the scalac plugin --- src/main/groovy/org/scoverage/ScoverageExtension.groovy | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/groovy/org/scoverage/ScoverageExtension.groovy b/src/main/groovy/org/scoverage/ScoverageExtension.groovy index 10e96a0..a7848ef 100644 --- a/src/main/groovy/org/scoverage/ScoverageExtension.groovy +++ b/src/main/groovy/org/scoverage/ScoverageExtension.groovy @@ -26,6 +26,8 @@ class ScoverageExtension { boolean highlighting = true /** regex for each excluded package */ List excludedPackages = [] + /** regex for each excluded file */ + List excludedFiles = [] ScoverageExtension(Project project) { @@ -90,6 +92,9 @@ class ScoverageExtension { if (extension.excludedPackages) { plugin.add("-P:scoverage:excludedPackages:${extension.excludedPackages.join(';')}".toString()) } + if (extension.excludedFiles) { + plugin.add("-P:scoverage:excludedFiles:${extension.excludedFiles.join(';')}".toString()) + } if (extension.highlighting) { plugin.add('-Yrangepos') }