From fc9e881ca5df5e7e6fd589f0c46e09b554b5187f Mon Sep 17 00:00:00 2001 From: Jan Ouwens Date: Fri, 12 Jul 2019 11:40:20 +0200 Subject: [PATCH] #70 Scala 2.13 support --- pom.xml | 2 +- .../org/scoverage/plugin/SCoveragePreCompileMojo.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 26dda971..d636977a 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ under the License. 2.2.1 3.6.0 - 1.4.0-RC1 + 1.4.0 diff --git a/src/main/java/org/scoverage/plugin/SCoveragePreCompileMojo.java b/src/main/java/org/scoverage/plugin/SCoveragePreCompileMojo.java index c14e7acc..f98ac070 100644 --- a/src/main/java/org/scoverage/plugin/SCoveragePreCompileMojo.java +++ b/src/main/java/org/scoverage/plugin/SCoveragePreCompileMojo.java @@ -82,7 +82,7 @@ public class SCoveragePreCompileMojo *
  • if specified, and equals {@code 2.10} or starts with {@code 2.10.} - {@code scalac-scoverage-plugin_2.10} will be used
  • *
  • if specified, and equals {@code 2.11} or starts with {@code 2.11.} - {@code scalac-scoverage-plugin_2.11} will be used
  • *
  • if specified, and equals {@code 2.12} or starts with {@code 2.12.} - {@code scalac-scoverage-plugin_2.12} will be used
  • - *
  • if specified, and equals {@code 2.13.0-RC1} - {@code scalac-scoverage-plugin_2.13.0-RC1} will be used
  • + *
  • if specified, and equals {@code 2.13} or starts with {@code 2.13.} - {@code scalac-scoverage-plugin_2.13} will be used
  • *
  • if specified, but does not meet any of the above conditions or if not specified - plugin execution will be skipped
  • * * @@ -249,9 +249,9 @@ else if ( "2.12".equals( resolvedScalaVersion ) || resolvedScalaVersion.startsWi { scalaBinaryVersion = "2.12"; } - else if ( "2.13.0-RC1".equals( resolvedScalaVersion ) ) + else if ( "2.13".equals( resolvedScalaVersion ) || resolvedScalaVersion.startsWith( "2.13." ) ) { - scalaBinaryVersion = "2.13.0-RC1"; + scalaBinaryVersion = "2.13"; } else { @@ -538,4 +538,4 @@ private void saveSourceRootsToFile() throws IOException } } -} \ No newline at end of file +}