Skip to content

#70 Scala 2.13 support #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2019
Merged

#70 Scala 2.13 support #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ under the License.
<maven.version>2.2.1</maven.version>
<maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>

<scalac-scoverage-plugin.version>1.4.0-RC1</scalac-scoverage-plugin.version>
<scalac-scoverage-plugin.version>1.4.0</scalac-scoverage-plugin.version>
</properties>

<dependencies>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/scoverage/plugin/SCoveragePreCompileMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public class SCoveragePreCompileMojo
* <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>
* <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>
* <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>
* <li>if specified, and equals {@code 2.13.0-RC1} - <b>{@code scalac-scoverage-plugin_2.13.0-RC1}</b> will be used</li>
* <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>
* <li>if specified, but does not meet any of the above conditions or if not specified - plugin execution will be skipped</li>
* </ul>
*
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -538,4 +538,4 @@ private void saveSourceRootsToFile() throws IOException
}
}

}
}