Skip to content

Commit a50ed4d

Browse files
gslowikowskigslowikowski
committed
Upgrade Scala, ScalaJS and Specs2 dependency versions in scripted tests
1 parent 5887c0c commit a50ed4d

File tree

14 files changed

+42
-36
lines changed

14 files changed

+42
-36
lines changed

‎src/sbt-test/scoverage/aggregate-only/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
lazy val commonSettings = Seq(
77
organization := "org.scoverage",
88
version := "0.1.0",
9-
scalaVersion := "2.10.4"
9+
scalaVersion := "2.12.8"
1010
)
1111

12-
lazy val specs2Lib = "org.specs2" %% "specs2" % "2.3.13" % "test"
12+
lazy val specs2Lib = "org.specs2" %% "specs2" % "2.5" % "test"
1313

1414
def module(name: String) = {
1515
val id = s"part$name"

‎src/sbt-test/scoverage/aggregate-only/test

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
> coverage
44
> test
55
# There should be scoverage-data directories for modules
6-
$ exists partA/target/scala-2.10/scoverage-data
7-
$ exists partB/target/scala-2.10/scoverage-data
6+
$ exists partA/target/scala-2.12/scoverage-data
7+
$ exists partB/target/scala-2.12/scoverage-data
88
# Generate aggregated reports without generating per-module reports first
99
> coverageAggregate
1010
# There shouldn't be scoverage-report directories for modules
11-
-$ exists partA/target/scala-2.10/scoverage-report
12-
-$ exists partB/target/scala-2.10/scoverage-report
11+
-$ exists partA/target/scala-2.12/scoverage-report
12+
-$ exists partB/target/scala-2.12/scoverage-report
1313
# There should be a root scoverage-report directory
14-
$ exists target/scala-2.10/scoverage-report
14+
$ exists target/scala-2.12/scoverage-report

‎src/sbt-test/scoverage/aggregate/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
lazy val commonSettings = Seq(
77
organization := "org.scoverage",
88
version := "0.1.0",
9-
scalaVersion := "2.10.4"
9+
scalaVersion := "2.12.8"
1010
)
1111

12-
lazy val specs2Lib = "org.specs2" %% "specs2" % "2.3.13" % "test"
12+
lazy val specs2Lib = "org.specs2" %% "specs2" % "2.5" % "test"
1313

1414
def module(name: String) = {
1515
val id = s"part$name"

‎src/sbt-test/scoverage/aggregate/test

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
> coverage
44
> test
55
# There should be scoverage-data directory
6-
$ exists partA/target/scala-2.10/scoverage-data
7-
$ exists partB/target/scala-2.10/scoverage-data
6+
$ exists partA/target/scala-2.12/scoverage-data
7+
$ exists partB/target/scala-2.12/scoverage-data
88
> coverageReport
99
# There should be scoverage-report directory
10-
$ exists partA/target/scala-2.10/scoverage-report
11-
$ exists partB/target/scala-2.10/scoverage-report
10+
$ exists partA/target/scala-2.12/scoverage-report
11+
$ exists partB/target/scala-2.12/scoverage-report
1212
> coverageAggregate
1313
# There should be a root scoverage-report directory
14-
$ exists target/scala-2.10/scoverage-report
14+
$ exists target/scala-2.12/scoverage-report

‎src/sbt-test/scoverage/bad-coverage/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version := "0.1"
22

3-
scalaVersion := "2.10.4"
3+
scalaVersion := "2.12.8"
44

5-
libraryDependencies += "org.specs2" %% "specs2" % "2.3.13" % "test"
5+
libraryDependencies += "org.specs2" %% "specs2" % "2.5" % "test"
66

77
coverageMinimum := 80
88

‎src/sbt-test/scoverage/coverage-off/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version := "0.1"
22

3-
scalaVersion := "2.10.4"
3+
scalaVersion := "2.12.8"
44

5-
libraryDependencies += "org.specs2" %% "specs2" % "2.3.13" % "test"
5+
libraryDependencies += "org.specs2" %% "specs2" % "2.5" % "test"
66

77
coverageMinimum := 80
88

‎src/sbt-test/scoverage/coverage-off/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
> coverageOff
88
> test
99
# There should be no scoverage-data directory
10-
-$ exists target/scala-2.10/scoverage-data
10+
-$ exists target/scala-2.12/scoverage-data

‎src/sbt-test/scoverage/good-coverage/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version := "0.1"
22

3-
scalaVersion := "2.10.4"
3+
scalaVersion := "2.12.8"
44

5-
libraryDependencies += "org.specs2" %% "specs2" % "2.3.13" % "test"
5+
libraryDependencies += "org.specs2" %% "specs2" % "2.5" % "test"
66

77
coverageMinimum := 80
88

‎src/sbt-test/scoverage/preserve-set/build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import sbt.complete.DefaultParsers._
22

33
version := "0.1"
44

5-
scalaVersion := "2.11.8"
5+
scalaVersion := "2.12.8"
66

7-
crossScalaVersions := Seq("2.10.6", "2.11.8")
7+
crossScalaVersions := Seq("2.10.6", "2.12.8")
88

9-
libraryDependencies += "org.specs2" %% "specs2" % "2.3.13" % "test"
9+
libraryDependencies += "org.specs2" %% "specs2" % "2.5" % "test"
1010

1111
val checkScalaVersion = inputKey[Unit]("Input task to compare the value of scalaVersion setting with a given input.")
1212
checkScalaVersion := {

‎src/sbt-test/scoverage/preserve-set/test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# check scalaVersion setting
2-
> checkScalaVersion "2.11.8"
2+
> checkScalaVersion "2.12.8"
33
> checkScoverageEnabled "false"
44
> coverage
55
> checkScoverageEnabled "true"
66
> coverageOff
7-
> checkScalaVersion "2.11.8"
7+
> checkScalaVersion "2.12.8"
88
> checkScoverageEnabled "false"
99
# changs scala version
1010
> ++2.10.6

0 commit comments

Comments
 (0)