removing SCCT occurrences

Author: 0xRoch

README.md

@@ -1,8 +1,8 @@
-[![Build Status](https://travis-ci.org/sqality/gradle-scct.png?branch=master)](https://travis-ci.org/sqality/gradle-scct)
+[![Build Status](https://travis-ci.org/scoverage/gradle-scoverage.png?branch=master)](https://travis-ci.org/scoverage/gradle-scoverage)
 
-gradle-scct
-===========
-A plugin to enable the use of SCCT in a gradle Scala project.
+gradle-scoverage
+================
+A plugin to enable the use of Scoverage in a gradle Scala project.
 
 This has now been deployed to maven central.
 
@@ -14,14 +14,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.sqality:gradle-scct:0.4.1'
+        classpath 'com.sqality:gradle-scoverage:0.4.1'
     }
 }
 
-apply plugin: com.sqality.ScctPlugin
+apply plugin: scoverage.ScoveragePlugin
 
 dependencies {
-    scct 'com.sqality.scct:scct_2.10:0.2.2'
+    scoverage 'org.scoverage:scalac-scoverage-plugin_2.10:0.98.4'
     compile 'org.scala-lang:scala-library:2.10.1'
 }
 ```
@@ -33,17 +33,17 @@ This creates an additional task testCoverage which will run tests against instru
 - [x] failing the build on lack of coverage
 
 Then launch command :
-`gradle testScct` or `gradle checkScct` 
+`gradle testScoverage` or `gradle checkScoverage`
 
 
-CheckScct
+CheckScoverage
 ---------
 
-By default, when you launch `gradle checkScct` build fail if only 75% of project is covered by tests.
+By default, when you launch `gradle checkScoverage` build fail if only 75% of project is covered by tests.
 
 To configure it as you want, add this configuration :
 ```
-checkScct {
+checkScoverage {
     minimumLineRate = 0.5
 }
 ```

build.gradle

@@ -62,13 +62,13 @@ uploadArchives {
             }
 
             pom.project {
-                name 'GradleSCCT'
-                description 'gradle-scct is a Gradle plugin for calculating code coverage using SCCT'
-                url 'http://sqality.com/'
+                name 'GradleScoverage'
+                description 'gradle-scoverage is a Gradle plugin for calculating code coverage using Scoverage'
+                url 'http://scoverage.org'
 
                 scm {
-                    url 'scm:git:https://github.com/sqality/gradle-scct.git'
-                    developerConnection 'scm:git:https://github.com/sqality/gradle-scct.git'
+                    url 'scm:git:https://github.com/scoverage/gradle-scoverage.git'
+                    developerConnection 'scm:git:https://github.com/scoverage/gradle-scoverage.git'
                 }
 
                 licenses {
@@ -83,6 +83,12 @@ uploadArchives {
                     developer {
                         id 'maiflai'
                     }
+                    developer {
+                        id 'ubourdon'
+                    }
+                    developer {
+                        id 'D-Roch'
+                    }
                 }
             }
         }

src/main/groovy/com/sqality/OverallCheckTask.groovy

@@ -13,7 +13,7 @@ class OverallCheckTask extends DefaultTask {
 
     @TaskAction
     void requireLineCoverage() {
-        def reportDirName = project.extensions[ScctPlugin.CONFIGURATION_NAME].reportDirName
+        def reportDirName = project.extensions[ScoveragePlugin.CONFIGURATION_NAME].reportDirName
 
         if (cobertura == null) cobertura = project.file("$project.buildDir/reports/$reportDirName/cobertura.xml")
 

src/main/groovy/com/sqality/ScctExtension.groovy

@@ -12,21 +12,21 @@ import org.gradle.api.tasks.testing.Test
  * Defines a new Test Task which executes normal tests with the instrumented classes.
  * Defines a new Check Task which enforces an overall line coverage requirement.
  */
-class ScctExtension {
+class ScoverageExtension {
 
-    ScctExtension(Project project) {
+    ScoverageExtension(Project project) {
 
         project.plugins.apply(JavaPlugin.class);
         project.plugins.apply(ScalaPlugin.class);
         project.afterEvaluate(configureRuntimeOptions)
 
-        project.configurations.create(ScctPlugin.CONFIGURATION_NAME) {
+        project.configurations.create(ScoveragePlugin.CONFIGURATION_NAME) {
             visible = false
             transitive = false
-            description = 'SCCT dependencies'
+            description = 'Scoverage dependencies'
         }
 
-        project.sourceSets.create(ScctPlugin.CONFIGURATION_NAME) {
+        project.sourceSets.create(ScoveragePlugin.CONFIGURATION_NAME) {
             def mainSourceSet = project.sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
 
             java.source(mainSourceSet.java)
@@ -36,12 +36,12 @@ class ScctExtension {
             runtimeClasspath += mainSourceSet.runtimeClasspath
         }
 
-        project.tasks.create(ScctPlugin.TEST_NAME, Test.class) {
-            dependsOn(project.tasks[ScctPlugin.COMPILE_NAME])
+        project.tasks.create(ScoveragePlugin.TEST_NAME, Test.class) {
+            dependsOn(project.tasks[ScoveragePlugin.COMPILE_NAME])
         }
 
-        project.tasks.create(ScctPlugin.CHECK_NAME, OverallCheckTask.class) {
-            dependsOn(project.tasks[ScctPlugin.TEST_NAME])
+        project.tasks.create(ScoveragePlugin.CHECK_NAME, OverallCheckTask.class) {
+            dependsOn(project.tasks[ScoveragePlugin.TEST_NAME])
         }
 
     }
@@ -50,27 +50,28 @@ class ScctExtension {
 
         @Override
         void execute(Project t) {
-            t.tasks[ScctPlugin.COMPILE_NAME].configure {
-                List<String> plugin = ['-Xplugin:' + t.configurations[ScctPlugin.CONFIGURATION_NAME].singleFile]
+            t.tasks[ScoveragePlugin.COMPILE_NAME].configure {
+                List<String> plugin = ['-Xplugin:' + t.configurations[ScoveragePlugin.CONFIGURATION_NAME].singleFile]
                 List<String> parameters = scalaCompileOptions.additionalParameters
                 if (parameters != null) {
                     plugin.addAll(parameters)
                 }
                 scalaCompileOptions.additionalParameters = plugin
                 // exclude the scala libraries that are added to enable scala version detection
-                classpath += t.configurations[ScctPlugin.CONFIGURATION_NAME]
+                classpath += t.configurations[ScoveragePlugin.CONFIGURATION_NAME]
             }
-            t.tasks[ScctPlugin.TEST_NAME].configure {
-                systemProperty 'scct.report.dir', "${t.buildDir}/reports/${t.extensions[ScctPlugin.CONFIGURATION_NAME].reportDirName}"
-                systemProperty 'scct.basedir', "${t.rootDir.absolutePath}"  // for multi-module checking
+            t.tasks[ScoveragePlugin.TEST_NAME].configure {
+                // TODO : fix this
+                systemProperty 'scoverage.report.dir', "${t.buildDir}/reports/${t.extensions[ScoveragePlugin.CONFIGURATION_NAME].reportDirName}"
+                systemProperty 'scoverage.basedir', "${t.rootDir.absolutePath}"  // for multi-module checking
 
                 def existingClasspath = classpath
-                classpath = t.files(t.sourceSets[ScctPlugin.CONFIGURATION_NAME].output.classesDir) +
-                        project.configurations[ScctPlugin.CONFIGURATION_NAME] +
+                classpath = t.files(t.sourceSets[ScoveragePlugin.CONFIGURATION_NAME].output.classesDir) +
+                        project.configurations[ScoveragePlugin.CONFIGURATION_NAME] +
                         existingClasspath
             }
         }
     }
 
-    String reportDirName = 'scct'
-}
+    String reportDirName = 'scoverage'
+}

src/main/groovy/com/sqality/ScctPlugin.groovy

@@ -3,17 +3,17 @@ package com.sqality
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
-class ScctPlugin implements Plugin<Project> {
-    static String CONFIGURATION_NAME = 'scct'
+class ScoveragePlugin implements Plugin<Project> {
+    static String CONFIGURATION_NAME = 'scoverage'
 
-    static String TEST_NAME = 'testScct'
-    static String CHECK_NAME = 'checkScct'
-    static String COMPILE_NAME = 'compileScctScala'
+    static String TEST_NAME = 'testScoverage'
+    static String CHECK_NAME = 'checkScoverage'
+    static String COMPILE_NAME = 'compileScoverageScala'
 
     @Override
     void apply(Project t) {
         if (t.extensions.findByName(CONFIGURATION_NAME) == null) {
-            t.extensions.create(CONFIGURATION_NAME, ScctExtension, t)
+            t.extensions.create(CONFIGURATION_NAME, ScoverageExtension, t)
         }
     }
-}
+}

src/main/resources/META-INF/gradle-plugins/scct.properties

@@ -1 +1 @@
-implementation-class=com.sqality.ScctPlugin
+implementation-class=scoverage.ScoveragePlugin

src/test/groovy/com/sqality/OverallCheckTaskTest.groovy

@@ -16,7 +16,7 @@ class OverallCheckTaskTest {
 
     private Project projectForLineRate(Number lineRate) {
         Project project = ProjectBuilder.builder().build()
-        project.plugins.apply(ScctPlugin)
+        project.plugins.apply(ScoveragePlugin)
         project.tasks.create('bob', OverallCheckTask) {
             minimumLineRate = lineRate
             cobertura = new File('src/test/resources/cobertura.xml')