Merge pull request #179 from gslowikowski/build-fixes

Build fixes. Tests compatible with Scala 2.10 and 2.11 (previously only with 2.11)

Author: gslowikowski

.gitignore

@@ -1,24 +1,20 @@
-*.class
 *.log
 
-.idea
-.idea_modules
-
-# sbt specific
-dist/*
+# SBT specific
 target/
-lib_managed/
-src_managed/
 project/boot/
 project/plugins/project/
-credentials.sbt
-*.icode
 
 # Eclipse specific
 .classpath
 .project
 .settings/
 
 # Scala-IDE specific
-.scala_dependencies
+.cache-main
+.cache-tests
+
+# IntelliJ IDEA specific
+.idea
+.idea_modules
 *.iml

.travis.yml

@@ -1,7 +1,11 @@
 language: scala
+
 scala:
-   - 2.11.4
+   - 2.10.6
+   - 2.11.8
+
 script:
-  - "sbt clean test"
+  - sbt ++$TRAVIS_SCALA_VERSION test
+
 jdk:
   - oraclejdk7

project/EnvSupport.scala

@@ -11,16 +11,15 @@ 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 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("2.10.6", "2.11.8"),
     fork in Test := false,
     publishMavenStyle := true,
     publishArtifact in Test := false,
@@ -70,7 +69,6 @@ object Scoverage extends Build {
     .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)
@@ -80,8 +78,7 @@ object Scoverage extends Build {
       libraryDependencies ++= Seq(
       "org.mockito" % "mockito-all" % MockitoVersion % "test",
       "org.scalatest" %% "scalatest" % ScalatestVersion % "test"
-      ),
-      javaOptions += "-XX:MaxMetaspaceSize=2048m"
+      )
     )
     .jsSettings(
       libraryDependencies += "org.scalatest" %%% "scalatest" % ScalatestVersion,
@@ -95,7 +92,6 @@ object Scoverage extends Build {
     .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",
@@ -107,10 +103,8 @@ object Scoverage extends Build {
   )).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
     }
   })

project/Scoverage.scala

@@ -1 +1 @@
-sbt.version=0.13.11
+sbt.version=0.13.12

project/build.properties

@@ -101,8 +101,8 @@ class CoberturaXmlWriterTest extends FunSuite with BeforeAndAfter with OneInstan
 
     val xml = XML.loadFile(fileIn(dir))
 
-    assert(xml \\ "coverage" \@ "line-rate" === "0.33", "line-rate")
-    assert(xml \\ "coverage" \@ "branch-rate" === "0.50", "branch-rate")
+    assert((xml \\ "coverage" \ "@line-rate").text === "0.33", "line-rate")
+    assert((xml \\ "coverage" \ "@branch-rate").text === "0.50", "branch-rate")
 
   }
 }

project/scales-build.iml

@@ -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/CoberturaXmlWriterTest.scala

@@ -1,6 +1,6 @@
 package scoverage
 
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 import org.scalatest._
 
 /** @author Stephen Samuel */
@@ -98,7 +98,7 @@ class PluginASTSupportTest
     compiler.compileCodeSnippet( """object Foo  {
                           |  final val foo = 1L
                           |}
-                          |@SerialVersionUID(value = Foo.foo)
+                          |@SerialVersionUID(Foo.foo)
                           |class Bar
                           |""".stripMargin)
     assert(!compiler.reporter.hasErrors)

scalac-scoverage-plugin/src/test/scala/scoverage/IOUtilsTest.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 */
@@ -27,7 +27,19 @@ class PluginCoverageTest
 
   test("scoverage should skip macros") {
     val compiler = ScoverageCompiler.default
-    val code = """
+    val code = if (ScoverageCompiler.ShortScalaVersion == "2.10")
+               """
+              import scala.language.experimental.macros
+              import scala.reflect.macros.Context
+              object Impl {
+                def poly[T: c.WeakTypeTag](c: Context) = c.literal(c.weakTypeOf[T].toString)
+              }
+
+              object Macros {
+                def poly[T] = macro Impl.poly[T]
+              }"""
+    else
+               """
               import scala.language.experimental.macros
               import scala.reflect.macros.Context
               class Impl(val c: Context) {

scalac-scoverage-plugin/src/test/scala/scoverage/PluginASTSupportTest.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._

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

@@ -11,7 +11,7 @@ import scala.tools.nsc.transform.{Transform, TypingTransformers}
 /** @author Stephen Samuel */
 object ScoverageCompiler {
 
-  val ScalaVersion = "2.11.7"
+  val ScalaVersion = scala.util.Properties.versionNumberString
   val ShortScalaVersion = ScalaVersion.dropRight(2)
 
   def classPath = getScalaJars.map(_.getAbsolutePath) :+ sbtCompileDir.getAbsolutePath :+ runtimeClasses.getAbsolutePath
@@ -45,13 +45,13 @@ object ScoverageCompiler {
   }
 
   private def sbtCompileDir: File = {
-    val dir = new File("./scalac-scoverage-plugin/target/scala-" + ShortScalaVersion + "/classes")
+    val dir = new File(s"./scalac-scoverage-plugin/target/scala-$ShortScalaVersion/classes")
     if (!dir.exists)
       throw new FileNotFoundException(s"Could not locate SBT compile directory for plugin files [$dir]")
     dir
   }
 
-  private def runtimeClasses: File = new File("./scalac-scoverage-runtime/jvm/target/scala-2.11/classes")
+  private def runtimeClasses: File = new File(s"./scalac-scoverage-runtime/jvm/target/scala-$ShortScalaVersion/classes")
 
   private def findScalaJar(artifactId: String): File = findIvyJar("org.scala-lang", artifactId, ScalaVersion)
 

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

@@ -3,7 +3,7 @@ package scoverage
 import java.io.StringWriter
 
 import org.scalatest.{OneInstancePerTest, FunSuite}
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 
 import scala.xml.Utility