aboutsummaryrefslogtreecommitdiff
path: root/stage2/plugins
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2017-02-22 22:27:31 +0800
committerChristopher Vogt <oss.nsp@cvogt.org>2017-02-22 22:27:31 +0800
commit698ef6c1d83215461275f9690a26178be3cae3fb (patch)
tree269d4325dfd4d4155743bd490c4999e0b3759c95 /stage2/plugins
parentee4f446e1dbef8f4983525376abf2274c01d0395 (diff)
downloadcbt-698ef6c1d83215461275f9690a26178be3cae3fb.tar.gz
cbt-698ef6c1d83215461275f9690a26178be3cae3fb.tar.bz2
cbt-698ef6c1d83215461275f9690a26178be3cae3fb.zip
a few hopefully simplifying rewirings in the implicits
Diffstat (limited to 'stage2/plugins')
-rw-r--r--stage2/plugins/Dotty.scala5
-rw-r--r--stage2/plugins/Frege.scala5
2 files changed, 4 insertions, 6 deletions
diff --git a/stage2/plugins/Dotty.scala b/stage2/plugins/Dotty.scala
index 9de2218..c96dbcb 100644
--- a/stage2/plugins/Dotty.scala
+++ b/stage2/plugins/Dotty.scala
@@ -16,7 +16,7 @@ trait Dotty extends BaseBuild{
override def dependencies: Seq[Dependency] = Seq( dottyLibrary )
private lazy val dottyLib = new DottyLib(
- logger, context.cbtLastModified, context.paths.mavenCache, dottyCompiler
+ context.cbtLastModified, context.paths.mavenCache, dottyCompiler
)
def compileJavaFirst: Boolean = false
@@ -69,11 +69,10 @@ object Dotty{
}
class DottyLib(
- logger: Logger,
cbtLastModified: Long,
mavenCache: File,
dottyCompiler: DependencyImplementation
-)(implicit transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache){
+)(implicit transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache, logger: Logger){
val lib = new Lib(logger)
import lib._
diff --git a/stage2/plugins/Frege.scala b/stage2/plugins/Frege.scala
index ae82f6b..3598d08 100644
--- a/stage2/plugins/Frege.scala
+++ b/stage2/plugins/Frege.scala
@@ -20,7 +20,7 @@ trait Frege extends BaseBuild{
override def scalaTarget: File = target ++ s"/frege-$fregeVersion"
private lazy val fregeLib = new FregeLib(
- logger, context.cbtLastModified, context.paths.mavenCache,
+ context.cbtLastModified, context.paths.mavenCache,
fregeVersion = fregeVersion, classifier = classifier,
fregeDependencies = fregeDependencies, fregeTarget = fregeTarget
)
@@ -40,14 +40,13 @@ trait Frege extends BaseBuild{
}
class FregeLib(
- logger: Logger,
cbtLastModified: Long,
mavenCache: File,
fregeVersion: String,
classifier: Option[String],
fregeDependencies: Seq[Dependency],
fregeTarget: String
-)(implicit transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache){
+)(implicit transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache, logger: Logger){
val lib = new Lib(logger)
import lib._