Skip to content

Commit a249a4a

Browse files
jqnogslowikowski
authored andcommitted
#70 Scala 2.13 support
1 parent b1c874a commit a249a4a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

pom.xml

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

93-
<scalac-scoverage-plugin.version>1.4.0-RC1</scalac-scoverage-plugin.version>
93+
<scalac-scoverage-plugin.version>1.4.0</scalac-scoverage-plugin.version>
9494
</properties>
9595

9696
<dependencies>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public class SCoveragePreCompileMojo
8282
* <li>if specified, and equals {@code 2.10} or starts with {@code 2.10.} - <b>{@code scalac-scoverage-plugin_2.10}</b> will be used</li>
8383
* <li>if specified, and equals {@code 2.11} or starts with {@code 2.11.} - <b>{@code scalac-scoverage-plugin_2.11}</b> will be used</li>
8484
* <li>if specified, and equals {@code 2.12} or starts with {@code 2.12.} - <b>{@code scalac-scoverage-plugin_2.12}</b> will be used</li>
85-
* <li>if specified, and equals {@code 2.13.0-RC1} - <b>{@code scalac-scoverage-plugin_2.13.0-RC1}</b> will be used</li>
85+
* <li>if specified, and equals {@code 2.13} or starts with {@code 2.13.} - <b>{@code scalac-scoverage-plugin_2.13}</b> will be used</li>
8686
* <li>if specified, but does not meet any of the above conditions or if not specified - plugin execution will be skipped</li>
8787
* </ul>
8888
*
@@ -249,9 +249,9 @@ else if ( "2.12".equals( resolvedScalaVersion ) || resolvedScalaVersion.startsWi
249249
{
250250
scalaBinaryVersion = "2.12";
251251
}
252-
else if ( "2.13.0-RC1".equals( resolvedScalaVersion ) )
252+
else if ( "2.13".equals( resolvedScalaVersion ) || resolvedScalaVersion.startsWith( "2.13." ) )
253253
{
254-
scalaBinaryVersion = "2.13.0-RC1";
254+
scalaBinaryVersion = "2.13";
255255
}
256256
else
257257
{
@@ -538,4 +538,4 @@ private void saveSourceRootsToFile() throws IOException
538538
}
539539
}
540540

541-
}
541+
}

0 commit comments

Comments
 (0)