Make the check-task flags configurable via the extension and not via the task itself

Author: eyalroth

src/functionalTest/resources/projects/scala-multi-module/build.gradle

@@ -28,11 +28,11 @@ allprojects {
         useJUnitPlatform()
     }
 
-    checkScoverage {
+    scoverage {
         minimumRate = 0.5
     }
 }
 
-checkScoverage {
+scoverage {
     minimumRate = 0.5
 }

src/functionalTest/resources/projects/scala-single-module/build.gradle

@@ -24,7 +24,7 @@ test {
     useJUnitPlatform()
 }
 
-checkScoverage {
+scoverage {
     minimumRate = 0.3
 }
 

src/main/groovy/org/scoverage/OverallCheckTask.groovy

@@ -44,8 +44,8 @@ enum CoverageType {
 class OverallCheckTask extends DefaultTask {
 
     /** Type of coverage to check. Available options: Line, Statement and Branch */
-    CoverageType coverageType = CoverageType.Statement
-    double minimumRate = 0.75
+    final Property<CoverageType> coverageType = project.objects.property(CoverageType)
+    final Property<BigDecimal> minimumRate = project.objects.property(BigDecimal)
 
     final Property<File> reportDir = project.objects.property(File)
 
@@ -56,7 +56,7 @@ class OverallCheckTask extends DefaultTask {
     void requireLineCoverage() {
         NumberFormat nf = NumberFormat.getInstance(locale == null ? Locale.getDefault() : locale)
 
-        Exception failure = checkLineCoverage(nf, reportDir.get(), coverageType, minimumRate)
+        Exception failure = checkLineCoverage(nf, reportDir.get(), coverageType.get(), minimumRate.get().doubleValue())
 
         if (failure) throw failure
     }

src/main/groovy/org/scoverage/ScoverageExtension.groovy

@@ -42,6 +42,9 @@ class ScoverageExtension {
 
     final Property<Boolean> runNormalCompilation
 
+    final Property<CoverageType> coverageType
+    final Property<BigDecimal> minimumRate
+
     ScoverageExtension(Project project) {
 
         project.plugins.apply(JavaPlugin.class)
@@ -88,5 +91,11 @@ class ScoverageExtension {
 
         runNormalCompilation = project.objects.property(Boolean)
         runNormalCompilation.set(true)
+
+        coverageType = project.objects.property(CoverageType)
+        coverageType.set(CoverageType.Statement)
+
+        minimumRate = project.objects.property(BigDecimal)
+        minimumRate.set(0.75)
     }
 }

src/main/groovy/org/scoverage/ScoveragePlugin.groovy

@@ -120,6 +120,8 @@ class ScoveragePlugin implements Plugin<PluginAware> {
         project.tasks.create(CHECK_NAME, OverallCheckTask.class) {
             dependsOn(reportTask)
             group = 'verification'
+            coverageType = extension.coverageType
+            minimumRate = extension.minimumRate
             reportDir = extension.reportDir
         }