From 92b26f394460aa609f9d073ea044776e7d8c46fb Mon Sep 17 00:00:00 2001
From: Christopher Vogt <oss.nsp@cvogt.org>
Date: Tue, 14 Feb 2017 00:07:57 -0500
Subject: implicitly pass classloader, might make code easier and prepares for
 allowing `run` and `runFlat` at Dependency instead of Build level

---
 plugins/scalajs/ScalaJsBuild.scala | 6 +-----
 plugins/scalajs/ScalaJsLib.scala   | 7 +++----
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'plugins/scalajs')

diff --git a/plugins/scalajs/ScalaJsBuild.scala b/plugins/scalajs/ScalaJsBuild.scala
index 99f8616..1694aea 100644
--- a/plugins/scalajs/ScalaJsBuild.scala
+++ b/plugins/scalajs/ScalaJsBuild.scala
@@ -4,11 +4,7 @@ import java.net.URL
 
 trait ScalaJsBuild extends BaseBuild {
   final protected val scalaJsLib = ScalaJsLib(
-    scalaJsVersion,
-    scalaVersion,
-    context.cbtLastModified,
-    context.classLoaderCache,
-    context.paths.mavenCache
+    scalaJsVersion, scalaVersion, context.cbtLastModified, context.paths.mavenCache
   )
   import scalaJsLib.{link => _,_}
 
diff --git a/plugins/scalajs/ScalaJsLib.scala b/plugins/scalajs/ScalaJsLib.scala
index f500039..393ebfe 100644
--- a/plugins/scalajs/ScalaJsLib.scala
+++ b/plugins/scalajs/ScalaJsLib.scala
@@ -2,9 +2,8 @@ package cbt
 import java.io.File
 
 case class ScalaJsLib(
-  scalaJsVersion: String, scalaVersion: String,
-  cbtLastModified: Long, classLoaderCache: ClassLoaderCache, mavenCache: File
-)(implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef]){
+  scalaJsVersion: String, scalaVersion: String, cbtLastModified: Long, mavenCache: File
+)(implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache){
   sealed trait ScalaJsOutputMode {
     def option: String
     def fileSuffix: String
@@ -36,7 +35,7 @@ case class ScalaJsLib(
         "--stdlib", s"${scalaJsLibraryDependency.jar.getAbsolutePath}",
         "--output", outputPath.string
       ) ++ scalaJsOptions ++ entriesToLink.map(_.getAbsolutePath),
-      scalaJsCliDep.classLoader(classLoaderCache)
+      scalaJsCliDep.classLoader
     )
   }
 
-- 
cgit v1.2.3