Upgrade to Scala 2.12 and Scoverage 1.5.0

gslowikowski · gslowikowski · commit 7b378d50b7b0 · 2016-12-28T13:07:40.000+01:00
Details:
- SBT Scoverage plugin version upgraded to 1.5.0,
- Scala versions changed from "2.10.6" and "2.11.8" to "2.11.8" and "2.12.1",
- "scala-compiler" dependency is not needed to compile macros, "scala-reflect" is sufficient ("scala-compiler" was required only when compiling for Scala 2.10.x),
- "akka-actor-tests" dependency changed to "akka-testkit" ("akka-actor-tests" was never needed, but it pulled required "akka-testkit" transitively).
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,8 @@ language: scala
 script: "sbt ++$TRAVIS_SCALA_VERSION coverage test coverageReport"
 
 scala:
-   - 2.10.6
    - 2.11.8
+   - 2.12.1
 
 jdk:
-   - oraclejdk7
+   - oraclejdk8
diff --git a/README.md b/README.md
@@ -7,9 +7,9 @@ A sample program for demonstrating scoverage's code coverage. This sample is an
 
 It uses:
 
-* Akka 2.3.16
+* Akka 2.4.16
 * Scalatest for unit tests
-* Scoverage 1.4.0
+* Scoverage 1.5.0
 
 To run:
 
diff --git a/build.sbt b/build.sbt
@@ -2,11 +2,11 @@ name := "sbt-scoverage-samples"
 
 organization := "org.scoverage"
 
-version := "1.4.0"
+version := "1.5.0"
 
-scalaVersion := "2.11.8"
+scalaVersion := "2.12.1"
 
-crossScalaVersions := Seq("2.10.6", "2.11.8")
+crossScalaVersions := Seq("2.11.8", "2.12.1")
 
 javacOptions ++= Seq("-source", "1.6", "-target", "1.6")
 
@@ -16,10 +16,10 @@ scalacOptions in (Compile, doc) ++= Seq("-unchecked", "-deprecation", "-diagrams
 
 libraryDependencies ++= Seq(
   "commons-io"                 %  "commons-io"             % "2.4",
-  "com.typesafe.akka"          %% "akka-actor"             % "2.3.16",
-  "com.typesafe.akka"          %% "akka-actor-tests"       % "2.3.16"           % "test",
+  "com.typesafe.akka"          %% "akka-actor"             % "2.4.16",
+  "com.typesafe.akka"          %% "akka-testkit"           % "2.4.16"           % "test",
   "org.typelevel"              %% "macro-compat"           % "1.1.1",
-  "org.scala-lang"             %  "scala-compiler"         % scalaVersion.value % "provided",
+  "org.scala-lang"             %  "scala-reflect"          % scalaVersion.value % "provided",
   "org.scalatest"              %% "scalatest"              % "3.0.0"            % "test",
   compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.full)
 )
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.4.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.4.0")`
	`1`	`+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")`