diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-14 00:07:57 -0500 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-14 00:34:48 -0500 |
commit | 92b26f394460aa609f9d073ea044776e7d8c46fb (patch) | |
tree | cb6deceebc0313e2186e686680b51187ddfd0095 /plugins | |
parent | dfde369b30bcde1c60add172e0e91caeb51e541b (diff) | |
download | cbt-92b26f394460aa609f9d073ea044776e7d8c46fb.tar.gz cbt-92b26f394460aa609f9d073ea044776e7d8c46fb.tar.bz2 cbt-92b26f394460aa609f9d073ea044776e7d8c46fb.zip |
implicitly pass classloader, might make code easier
and prepares for allowing `run` and `runFlat` at
Dependency instead of Build level
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/scalajs/ScalaJsBuild.scala | 6 | ||||
-rw-r--r-- | plugins/scalajs/ScalaJsLib.scala | 7 | ||||
-rw-r--r-- | plugins/scalatest/ScalaTest.scala | 5 |
3 files changed, 6 insertions, 12 deletions
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 ) } diff --git a/plugins/scalatest/ScalaTest.scala b/plugins/scalatest/ScalaTest.scala index 56405aa..21f656b 100644 --- a/plugins/scalatest/ScalaTest.scala +++ b/plugins/scalatest/ScalaTest.scala @@ -5,9 +5,8 @@ import org.scalatest._ trait ScalaTest extends BaseBuild{ override def run: ExitCode = { import ScalaTestLib._ - val _classLoader = classLoader(context.classLoaderCache) - val suiteNames = exportedClasspath.files.map( d => discoverSuites(d, _classLoader) ).flatten - runSuites( suiteNames.map( loadSuite( _, _classLoader ) ) ) + val suiteNames = exportedClasspath.files.map( d => discoverSuites(d, classLoader) ).flatten + runSuites( suiteNames.map( loadSuite( _, classLoader ) ) ) ExitCode.Success } override def dependencies = super.dependencies ++ Resolver( mavenCentral ).bind( ScalaDependency("org.scalatest","scalatest","2.2.4") ) |