From 698ef6c1d83215461275f9690a26178be3cae3fb Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Wed, 22 Feb 2017 22:27:31 +0800 Subject: a few hopefully simplifying rewirings in the implicits --- stage2/plugins/Dotty.scala | 5 ++--- stage2/plugins/Frege.scala | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'stage2') 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._ -- cgit v1.2.3