Skip to content

Commit b2cca1b

Browse files
committed
#44 - Scala 2.12 support.
Temporarily use version `1.3.0-RC2` of `scalac-scoverage-plugin` dependency (version `1.3.0` is not released yet, version `1.3.0-RC2` uses Scala version `2.12.0-RC2` which is identical with `2.12.0`).
1 parent b24fd8d commit b2cca1b

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ under the License.
9090
<maven.version>2.2.1</maven.version>
9191
<maven-plugin-plugin.version>3.5</maven-plugin-plugin.version>
9292

93-
<scalac-scoverage-plugin.version>1.2.0</scalac-scoverage-plugin.version>
93+
<scalac-scoverage-plugin.version>1.3.0-RC2</scalac-scoverage-plugin.version>
94+
<!--TMP <scalac-scoverage-plugin.version>1.3.0</scalac-scoverage-plugin.version>-->
9495
</properties>
9596

9697
<dependencies>

src/main/java/org/scoverage/plugin/SCoveragePreCompileMojo.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public class SCoveragePreCompileMojo
7575
* <ul>
7676
* <li>if specified, and starts with {@code 2.10.} - <b>{@code scalac-scoverage-plugin_2.10}</b> will be used</li>
7777
* <li>if specified, and starts with {@code 2.11.} - <b>{@code scalac-scoverage-plugin_2.11}</b> will be used</li>
78-
* <li>if specified, but does not start with {@code 2.10.} or with {@code 2.11.} or is not specified - plugin execution will be skipped</li>
78+
* <li>if specified, and starts with {@code 2.12.} - <b>{@code scalac-scoverage-plugin_2.12}</b> will be used</li>
79+
* <li>if specified, but does not start with {@code 2.10.}, {@code 2.11.} or {@code 2.12.} or is not specified - plugin execution will be skipped</li>
7980
* </ul>
8081
*
8182
* @since 1.0.0
@@ -222,6 +223,11 @@ else if ( resolvedScalaVersion.startsWith( "2.11." ) )
222223
{
223224
scalaMainVersion = "2.11";
224225
}
226+
else if ( resolvedScalaVersion.startsWith( "2.12." ) )
227+
{
228+
scalaMainVersion = "2.12.0-RC2";
229+
//TMP scalaMainVersion = "2.12";
230+
}
225231
else
226232
{
227233
getLog().warn( String.format( "Skipping SCoverage execution - unsupported Scala version \"%s\"",

0 commit comments

Comments
 (0)