Pass scalajs-library.ja to the -classpath setting of the compiler

So that it ends up on the classpath of the project being compiled instead.

Author: exoego

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

@@ -3,8 +3,6 @@ package scoverage
 import java.io.{File, FileNotFoundException}
 import java.net.URL
 
-import scoverage.ScoverageCompiler.getScalaJsJars
-
 import scala.collection.mutable.ListBuffer
 import scala.tools.nsc.{Settings, Global}
 import scala.tools.nsc.plugins.PluginComponent
@@ -19,8 +17,8 @@ object ScoverageCompiler {
     case _                                       => ScalaVersion
   }
 
-  def classPath = (getScalaJars ++ getScalaJsJars ++ List(sbtCompileDir, runtimeClasses)).map(_.getAbsolutePath)
-
+  def classPath = getScalaJars.map(_.getAbsolutePath) :+ sbtCompileDir.getAbsolutePath :+ runtimeClasses.getAbsolutePath
+  
   def settings: Settings = {
     val s = new scala.tools.nsc.Settings
     s.Xprint.value = List("all", "_")
@@ -50,11 +48,6 @@ object ScoverageCompiler {
     scalaJars.map(findScalaJar)
   }
 
-  private def getScalaJsJars: List[File] = {
-    val scalaJars = List("scalajs-library")
-    scalaJars.map(findScalaJsJar)
-  }
-
   private def sbtCompileDir: File = {
     val dir = new File(s"./scalac-scoverage-plugin/target/scala-$ShortScalaVersion/classes")
     if (!dir.exists)
@@ -66,8 +59,6 @@ object ScoverageCompiler {
 
   private def findScalaJar(artifactId: String): File = findIvyJar("org.scala-lang", artifactId, ScalaVersion)
 
-  private def findScalaJsJar(artifactId: String): File = findIvyJar(s"org.scala-js", s"${artifactId}_${ShortScalaVersion}", "0.6.28")
-
   private def findIvyJar(groupId: String, artifactId: String, version: String, packaging: String = "jar"): File = {
     val userHome = System.getProperty("user.home")
     val jarPath = s"$userHome/.ivy2/cache/$groupId/$artifactId/${packaging}s/$artifactId-$version.jar"
@@ -84,6 +75,8 @@ class ScoverageCompiler(settings: scala.tools.nsc.Settings, rep: scala.tools.nsc
   def addToClassPath(file: File): Unit = {
     settings.classpath.value = settings.classpath.value + File.pathSeparator + file.getAbsolutePath
   }
+  
+  addToClassPath(ScoverageCompiler.findIvyJar(s"org.scala-js", s"scalajs-library_${ScoverageCompiler.ShortScalaVersion}", "0.6.28"))
 
   val instrumentationComponent = new ScoverageInstrumentationComponent(this, None, None)
   instrumentationComponent.setOptions(new ScoverageOptions())