Skip to content

Commit e60140b

Browse files
committed
Support for Sonar 3.5.1
1 parent 0e89dd1 commit e60140b

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ just plain average of coverage rates for sub-projects.
2222

2323
## Requirements ##
2424

25-
- [SonarQube] 4.0
25+
- [SonarQube] 3.5.1
2626
- [Scoverage] 0.95.7
2727

2828
## Installation ##

plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
</repositories>
7070

7171
<properties>
72-
<sonar.version>4.0</sonar.version>
72+
<sonar.version>3.5.1</sonar.version>
7373

7474
<sonar.pluginKey>scoverage</sonar.pluginKey>
7575
<sonar.pluginName>Scoverage</sonar.pluginName>

plugin/src/main/java/com/buransky/plugins/scoverage/ScoveragePlugin.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
*/
2020
package com.buransky.plugins.scoverage;
2121

22+
import com.buransky.plugins.scoverage.language.Scala;
2223
import com.buransky.plugins.scoverage.measure.ScalaMetrics;
2324
import com.buransky.plugins.scoverage.sensor.ScoverageSensor;
24-
import com.buransky.plugins.scoverage.language.Scala;
2525
import com.buransky.plugins.scoverage.sensor.ScoverageSourceImporterSensor;
2626
import com.buransky.plugins.scoverage.widget.ScoverageWidget;
2727
import org.sonar.api.Extension;
@@ -36,7 +36,6 @@
3636
* @author Rado Buransky
3737
*/
3838
public class ScoveragePlugin extends SonarPlugin {
39-
4039
public List<Class<? extends Extension>> getExtensions() {
4140
final List<Class<? extends Extension>> extensions = new ArrayList<Class<? extends Extension>>();
4241
extensions.add(ScalaMetrics.class);

plugin/src/main/java/com/buransky/plugins/scoverage/sensor/ScoverageSensor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ public void analyse(Project project, SensorContext context) {
7777
}
7878
else {
7979
if (project.isModule()) {
80-
log.warn(LogUtil.f("Report path not set for " + project.name() + " module! [" +
81-
project.name() + "." + SCOVERAGE_REPORT_PATH_PROPERTY + "]"));
80+
log.warn(LogUtil.f("Report path not set for " + project.getName() + " module! [" +
81+
project.getName() + "." + SCOVERAGE_REPORT_PATH_PROPERTY + "]"));
8282
}
8383
else {
8484
// Compute overall statement coverage from submodules
@@ -90,12 +90,12 @@ public void analyse(Project project, SensorContext context) {
9090
Measure moduleCoveredStatementCount = context.getMeasure(module, ScalaMetrics.COVERED_STATEMENTS);
9191

9292
if ((moduleStatementCount == null) || (moduleCoveredStatementCount == null))
93-
log.debug(LogUtil.f("Module has no statement coverage. [" + module.name() + "]"));
93+
log.debug(LogUtil.f("Module has no statement coverage. [" + module.getName() + "]"));
9494
else {
9595
totalStatementCount += moduleStatementCount.getValue();
9696
coveredStatementCount += moduleCoveredStatementCount.getValue();
9797

98-
log.debug(LogUtil.f("Statement count for " + module.name() + " module. [" +
98+
log.debug(LogUtil.f("Statement count for " + module.getName() + " module. [" +
9999
moduleStatementCount.getValue() + ", " + moduleCoveredStatementCount.getValue() + "]"));
100100
}
101101
}

samples/sbt/multi-module/sonar-project.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
sonar.projectKey=com.buranskt:multi-module
1+
sonar.projectKey=com.buransky:multi-module
22
sonar.projectName=Sonar Scoverage plugin multi-module sample project
3-
sonar.projectVersion=1.0.0
3+
sonar.projectVersion=1.0.1
44

55
sonar.language=scala
66

@@ -12,4 +12,4 @@ module1.sonar.scoverage.reportPath=target/scala-2.10/scoverage-report/scoverage.
1212

1313
module2.sonar.sources=src/main/scala
1414
module2.sonar.tests=src/test/scala
15-
module2.sonar.scoverage.reportPath=target/scala-2.10/scoverage-report/scoverage.xml
15+
module2.sonar.scoverage.reportPath=target/scala-2.10/scoverage-report/scoverage.xml

0 commit comments

Comments
 (0)