Skip to content

Commit 7ae649b

Browse files
committed
Add Scala 2.13.0-RC1 support
- upgrade Scala version from 2.13.0-M5 to 2.13.0-RC1 in `build.sbt` and `.travis.yml` - upgrade scalatest version from 3.0.6-SNAP4 to 3.0.8-RC2 - upgrade stala-xml version from 1.1.1 to 1.2.0 Some fixes in tests were required: - 's' and 'raw' string interpolators are now implemented as macros and macros are not instrumented; 's"Hello, $name"' expression was changed to explicit strings concatenation '"Hello, " + name' so the number of instrumented statements is the same in all Scala versions see: scala/scala@0cebcdf#diff-648e8f7f409d844c3c99b2d5a0d0dfe5R94 scala/scala#7779 - special symbol for all compilation phases was changed from "all" to "_" see: scala/scala@4d29431#diff-d686e8e67add4d42682f22193d20494bR1246 scala/scala#7908
1 parent 9cf6357 commit 7ae649b

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ scala:
1010
- 2.10.7
1111
- 2.11.12
1212
- 2.12.8
13-
- 2.13.0-M5
13+
- 2.13.0-RC1
1414

1515
before_cache:
1616
- find "$HOME/.sbt/" -name '*.lock' -print0 | xargs -0 rm

build.sbt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import sbtcrossproject.CrossProject
66
import sbtcrossproject.CrossType
77

88
val Org = "org.scoverage"
9-
val ScalatestVersion = "3.0.6-SNAP4"
9+
val ScalatestVersion = "3.0.8-RC2"
1010

1111
val appSettings = Seq(
1212
organization := Org,
1313
scalaVersion := "2.12.8",
14-
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0-M5"),
14+
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0-RC1"),
1515
fork in Test := false,
1616
publishMavenStyle := true,
1717
publishArtifact in Test := false,
@@ -43,6 +43,11 @@ val appSettings = Seq(
4343
<name>Stephen Samuel</name>
4444
<url>http://github.com/sksamuel</url>
4545
</developer>
46+
<developer>
47+
<id>gslowikowski</id>
48+
<name>Grzegorz Slowikowski</name>
49+
<url>http://github.com/gslowikowski</url>
50+
</developer>
4651
</developers>
4752
},
4853
pomIncludeRepository := {
@@ -97,7 +102,7 @@ lazy val plugin = Project("scalac-scoverage-plugin", file("scalac-scoverage-plug
97102
libraryDependencies ++= {
98103
CrossVersion.partialVersion(scalaVersion.value) match {
99104
case Some((2, scalaMajor)) if scalaMajor > 10 =>
100-
Seq("org.scala-lang.modules" %% "scala-xml" % "1.1.1")
105+
Seq("org.scala-lang.modules" %% "scala-xml" % "1.2.0")
101106
case _ =>
102107
Seq()
103108
}

scalac-scoverage-plugin/src/test/scala/scoverage/PluginCoverageTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class PluginCoverageTest
1414
compiler.compileCodeSnippet( """ object DefaultArgumentsObject {
1515
| val defaultName = "world"
1616
| def makeGreeting(name: String = defaultName): String = {
17-
| s"Hello, $name"
17+
| "Hello, " + name
1818
| }
1919
|} """.stripMargin)
2020
assert(!compiler.reporter.hasErrors)

scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageCompiler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object ScoverageCompiler {
2121

2222
def settings: Settings = {
2323
val s = new scala.tools.nsc.Settings
24-
s.Xprint.value = List("all")
24+
s.Xprint.value = List("all", "_")
2525
s.deprecation.value = true
2626
s.Yrangepos.value = true
2727
s.Yposdebug.value = true

0 commit comments

Comments
 (0)