Scala 2.12.0-RC1 support.

Author: paulp

.travis.yml

@@ -1,7 +1,19 @@
 language: scala
+jdk: oraclejdk8
+
 scala:
-   - 2.11.4
+- 2.11.8
+- 2.12.0-RC1
+
 script:
-  - "sbt clean test"
-jdk:
-  - oraclejdk7
+- ./publishScalaLogging.sh
+- sbt ++$TRAVIS_SCALA_VERSION test
+
+cache:
+  directories:
+  - $HOME/.ivy2/cache
+  - $HOME/.sbt
+
+before_cache:
+- find "$HOME/.sbt/" -name '*.lock' -print0 | xargs -0 rm
+- find "$HOME/.ivy2/" -name 'ivydata-*.properties' -print0 | xargs -0 rm

project/Scoverage.scala

@@ -1,7 +1,5 @@
 import sbt.Keys._
 import sbt._
-import sbtrelease.ReleasePlugin
-import sbtrelease.ReleasePlugin.ReleaseKeys
 import com.typesafe.sbt.pgp.PgpKeys
 import org.scalajs.sbtplugin.cross.CrossProject
 import org.scalajs.sbtplugin.cross.CrossType
@@ -11,24 +9,24 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 object Scoverage extends Build {
 
   val Org = "org.scoverage"
-  val Scala = "2.11.7"
-  val MockitoVersion = "1.9.5"
-  val ScalatestVersion = "3.0.0-M15"
+  val MockitoVersion = "1.10.19"
+  val ScalatestVersion = "3.0.0"
 
   lazy val LocalTest = config("local") extend Test
 
   val appSettings = Seq(
     organization := Org,
-    scalaVersion := Scala,
-    crossScalaVersions := Seq("2.10.6", "2.11.7"),
+    scalaVersion := "2.11.8",
+    crossScalaVersions := Seq(scalaVersion.value, "2.12.0-RC1"),
     fork in Test := false,
     publishMavenStyle := true,
     publishArtifact in Test := false,
     parallelExecution in Test := false,
+    sbtrelease.ReleasePlugin.autoImport.releasePublishArtifactsAction := PgpKeys.publishSigned.value,
+    sbtrelease.ReleasePlugin.autoImport.releaseCrossBuild := true,
     scalacOptions := Seq("-unchecked", "-deprecation", "-feature", "-encoding", "utf8"),
     resolvers := ("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2") +: resolvers.value,
     concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
-    javacOptions := Seq("-source", "1.6", "-target", "1.6"),
     publishTo <<= version {
       (v: String) =>
         val nexus = "https://oss.sonatype.org/"
@@ -61,27 +59,22 @@ object Scoverage extends Build {
     pomIncludeRepository := {
       _ => false
     }
-  ) ++ ReleasePlugin.releaseSettings ++ Seq(
-    ReleaseKeys.crossBuild := true,
-    ReleaseKeys.publishArtifactsAction := PgpKeys.publishSigned.value
   )
 
   lazy val root = Project("scalac-scoverage", file("."))
     .settings(name := "scalac-scoverage")
     .settings(appSettings: _*)
     .settings(publishArtifact := false)
-    .settings(javaOptions += "-XX:MaxMetaspaceSize=2048m")
     .aggregate(plugin, runtime.jvm, runtime.js)
 
   lazy val runtime = CrossProject("scalac-scoverage-runtime", file("scalac-scoverage-runtime"), CrossType.Full)
     .settings(name := "scalac-scoverage-runtime")
     .settings(appSettings: _*)
     .jvmSettings(
       libraryDependencies ++= Seq(
-      "org.mockito" % "mockito-all" % MockitoVersion % "test",
-      "org.scalatest" %% "scalatest" % ScalatestVersion % "test"
-      ),
-      javaOptions += "-XX:MaxMetaspaceSize=2048m"
+      "org.mockito" % "mockito-all" % MockitoVersion % Test,
+      "org.scalatest" %% "scalatest" % ScalatestVersion % Test
+      )
     )
     .jsSettings(
       libraryDependencies += "org.scalatest" %%% "scalatest" % ScalatestVersion,
@@ -92,26 +85,17 @@ object Scoverage extends Build {
   lazy val `scalac-scoverage-runtimeJS` = runtime.js
 
   lazy val plugin = Project("scalac-scoverage-plugin", file("scalac-scoverage-plugin"))
-    .dependsOn(`scalac-scoverage-runtimeJVM` % "test")
+    .dependsOn(`scalac-scoverage-runtimeJVM` % Test)
     .settings(name := "scalac-scoverage-plugin")
     .settings(appSettings: _*)
-    .settings(javaOptions += "-XX:MaxMetaspaceSize=2048m")
     .settings(libraryDependencies ++= Seq(
-    "org.mockito" % "mockito-all" % MockitoVersion % "test",
-    "org.scalatest" %% "scalatest" % ScalatestVersion % "test",
-    "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided",
-    "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
-    "org.joda" % "joda-convert" % "1.6" % "test",
-    "joda-time" % "joda-time" % "2.3" % "test",
-    "com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2" % "test"
-  )).settings(libraryDependencies ++= {
-    CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, scalaMajor)) if scalaMajor == 11 =>
-        EnvSupport.setEnv("CrossBuildScalaVersion", "2.11.7")
-        Seq("org.scala-lang.modules" %% "scala-xml" % "1.0.4")
-      case _ =>
-        EnvSupport.setEnv("CrossBuildScalaVersion", "2.10.6")
-        Nil
-    }
-  })
+      "org.mockito"                %  "mockito-all"    % MockitoVersion     % Test,
+      "org.scalatest"              %% "scalatest"      % ScalatestVersion   % Test,
+      "org.scala-lang"             %  "scala-reflect"  % scalaVersion.value % "provided",
+      "org.scala-lang"             %  "scala-compiler" % scalaVersion.value % "provided",
+      "org.joda"                   %  "joda-convert"   % "1.8.1"            % Test,
+      "joda-time"                  %  "joda-time"      % "2.9.4"            % Test,
+      "com.typesafe.scala-logging" %% "scala-logging"  % "3.5.0-SNAPSHOT"   % Test,
+      "org.scala-lang.modules"     %% "scala-xml"      % "1.0.5"
+    ))
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.11
+sbt.version=0.13.13-M1

project/plugins.sbt

@@ -1,9 +1,6 @@
 resolvers += Classpaths.sbtPluginReleases
 
-addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.3.2")
-
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
-
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")
-
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.9")
+addSbtPlugin("org.scalastyle"    %% "scalastyle-sbt-plugin" % "0.8.0")
+addSbtPlugin("com.jsuereth"      %  "sbt-pgp"               % "1.0.0")
+addSbtPlugin("com.github.gseitz" %  "sbt-release"           % "1.0.3")
+addSbtPlugin("org.scala-js"      %  "sbt-scalajs"           % "0.6.12")

publishScalaLogging.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+#
+
+set -euo pipefail
+
+cd "${TMPDIR:-/tmp}"
+git clone "https://github.com/typesafehub/scala-logging"
+( cd scala-logging && sbt -sbt-version 0.13.13-M1 ++2.11.8 publishLocal ++2.12.0-RC1 publishLocal )
+rm -rf scala-logging

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

@@ -3,7 +3,7 @@ package scoverage
 import java.io.{File, FileWriter}
 import java.util.UUID
 
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 import org.scalatest.{FreeSpec, Matchers, OneInstancePerTest}
 
 /** @author Stephen Samuel */

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

@@ -28,8 +28,9 @@ class LocationCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tools
   class LocationSetter(val global: Global) extends PluginComponent with TypingTransformers with Transform {
 
     override val phaseName: String = "location-setter"
-    override val runsAfter: List[String] = List("typer")
-    override val runsBefore = List[String]("patmat")
+    override val runsRightAfter    = Some("typer")
+    override val runsAfter         = List("typer")
+    override val runsBefore        = List[String]("patmat")
 
     override protected def newTransformer(unit: global.CompilationUnit): global.Transformer = new Transformer(unit)
     class Transformer(unit: global.CompilationUnit) extends TypingTransformer(unit) {
@@ -44,35 +45,7 @@ class LocationCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tools
   }
 
   override def computeInternalPhases() {
-    val phs = List(
-      syntaxAnalyzer -> "parse source into ASTs, perform simple desugaring",
-      analyzer.namerFactory -> "resolve names, attach symbols to named trees",
-      analyzer.packageObjects -> "load package objects",
-      analyzer.typerFactory -> "the meat and potatoes: type the trees",
-      locationSetter -> "sets locations",
-      patmat -> "translate match expressions",
-      superAccessors -> "add super accessors in traits and nested classes",
-      extensionMethods -> "add extension methods for inline classes",
-      pickler -> "serialize symbol tables",
-      refChecks -> "reference/override checking, translate nested objects",
-      uncurry -> "uncurry, translate function values to anonymous classes",
-      tailCalls -> "replace tail calls by jumps",
-      specializeTypes -> "@specialized-driven class and method specialization",
-      explicitOuter -> "this refs to outer pointers, translate patterns",
-      erasure -> "erase types, add interfaces for traits",
-      postErasure -> "clean up erased inline classes",
-      lazyVals -> "allocate bitmaps, translate lazy vals into lazified defs",
-      lambdaLift -> "move nested functions to top level",
-      constructors -> "move field definitions into constructors",
-      mixer -> "mixin composition",
-      cleanup -> "platform-specific cleanups, generate reflective calls",
-      genicode -> "generate portable intermediate code",
-      inliner -> "optimization: do inlining",
-      inlineExceptionHandlers -> "optimization: inline exception handlers",
-      closureElimination -> "optimization: eliminate uncalled closures",
-      deadCode -> "optimization: eliminate dead code",
-      terminal -> "The last phase in the compiler chain"
-    )
-    phs foreach (addToPhasesSet _).tupled
+    super.computeInternalPhases()
+    addToPhasesSet(locationSetter, "sets locations")
   }
-}
+}

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

@@ -1,6 +1,6 @@
 package scoverage
 
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 import org.scalatest._
 
 /** @author Stephen Samuel */
@@ -79,10 +79,8 @@ class PluginASTSupportTest
   // https://github.com/skinny-framework/skinny-framework/issues/97
   test("macro range positions should not break plugin") {
     val compiler = ScoverageCompiler.default
-    compiler.addToClassPath("org.slf4j", "slf4j-api", "1.7.7")
-    compiler.addToClassPath("com.typesafe.scala-logging", "scala-logging-api_" + ScoverageCompiler.ShortScalaVersion, "2.1.2")
-    compiler.addToClassPath("com.typesafe.scala-logging", "scala-logging-slf4j_" + ScoverageCompiler.ShortScalaVersion, "2.1.2")
-    compiler.compileCodeSnippet( """import com.typesafe.scalalogging.slf4j.StrictLogging
+    compiler.addLogging()
+    compiler.compileCodeSnippet( """import com.typesafe.scalalogging.StrictLogging
                           |
                           |object MacroTest extends StrictLogging {
                           |  println("Hello")

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

@@ -1,6 +1,6 @@
 package scoverage
 
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 import org.scalatest.{BeforeAndAfterEachTestData, FunSuite, OneInstancePerTest}
 
 /** @author Stephen Samuel */
@@ -275,16 +275,8 @@ class PluginCoverageTest
 
   test("plugin should not instrument expanded macro code github.com/skinny-framework/skinny-framework/issues/97") {
     val compiler = ScoverageCompiler.default
-    compiler.addToClassPath("org.slf4j", "slf4j-api", "1.7.7")
-    compiler
-      .addToClassPath("com.typesafe.scala-logging",
-        "scala-logging-api_" + ScoverageCompiler.ShortScalaVersion,
-        "2.1.2")
-    compiler
-      .addToClassPath("com.typesafe.scala-logging",
-        "scala-logging-slf4j_" + ScoverageCompiler.ShortScalaVersion,
-        "2.1.2")
-    compiler.compileCodeSnippet( """import com.typesafe.scalalogging.slf4j.StrictLogging
+    compiler.addLogging()
+    compiler.compileCodeSnippet( """import com.typesafe.scalalogging.StrictLogging
                                    |class MacroTest extends StrictLogging {
                                    |  logger.info("will break")
                                    |} """.stripMargin)

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

@@ -1,7 +1,7 @@
 package scoverage
 
 import org.mockito.Mockito
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 import org.scalatest.{FreeSpec, Matchers}
 
 import scala.reflect.internal.util._