Skip to content

Commit a37dc0f

Browse files
committed
Upgrade Scala, ScalaTest, Scoverage to the latest versions
(cherry picked from commit 604d43d)
1 parent 9a33e8e commit a37dc0f

File tree

5 files changed

+10
-14
lines changed

5 files changed

+10
-14
lines changed

samples/sbt/multi-module/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
organization := "com.buransky"
22

3-
scalaVersion := "2.10.3"
3+
scalaVersion := "2.11.6"
44

55
lazy val root = project.in(file(".")).aggregate(module1, module2)
66

samples/sbt/multi-module/module1/build.sbt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ name := Common.baseName + "-module1"
44

55
version := Common.version
66

7-
scalaVersion := "2.10.3"
7+
scalaVersion := "2.11.6"
88

99
libraryDependencies ++= Seq(
10-
"org.scalatest" %% "scalatest" % "2.0" % "test"
11-
)
12-
13-
ScoverageSbtPlugin.instrumentSettings
10+
"org.scalatest" %% "scalatest" % "2.2.4" % "test"
11+
)

samples/sbt/multi-module/module2/build.sbt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ name := Common.baseName + "-module2"
44

55
version := Common.version
66

7-
scalaVersion := "2.10.3"
7+
scalaVersion := "2.11.6"
88

99
libraryDependencies ++= Seq(
10-
"org.scalatest" %% "scalatest" % "2.0" % "test"
11-
)
12-
13-
ScoverageSbtPlugin.instrumentSettings
10+
"org.scalatest" %% "scalatest" % "2.2.4" % "test"
11+
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
resolvers += Classpaths.sbtPluginReleases
22

3-
addSbtPlugin("com.sksamuel.scoverage" %% "sbt-scoverage" % "0.95.7")
3+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.1.0")

samples/sbt/multi-module/sonar-project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ sonar.modules=module1,module2
88

99
module1.sonar.sources=src/main/scala
1010
module1.sonar.tests=src/test/scala
11-
module1.sonar.scoverage.reportPath=target/scala-2.10/scoverage-report/scoverage.xml
11+
module1.sonar.scoverage.reportPath=target/scala-2.11/scoverage-report/scoverage.xml
1212

1313
module2.sonar.sources=src/main/scala
1414
module2.sonar.tests=src/test/scala
15-
module2.sonar.scoverage.reportPath=target/scala-2.10/scoverage-report/scoverage.xml
15+
module2.sonar.scoverage.reportPath=target/scala-2.11/scoverage-report/scoverage.xml

0 commit comments

Comments
 (0)