diff options
| author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-22 22:41:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-22 22:41:28 +0800 |
| commit | fdb5d7cdb692ded3ccc1d865282169598d190c03 (patch) | |
| tree | a8657b2b0394a21a1e8dae9a003ee1c3693dc0b9 /stage2 | |
| parent | b89d3fd4b14d957f1529a26819ddc009c2a3de20 (diff) | |
| parent | 698ef6c1d83215461275f9690a26178be3cae3fb (diff) | |
| download | cbt-fdb5d7cdb692ded3ccc1d865282169598d190c03.tar.gz cbt-fdb5d7cdb692ded3ccc1d865282169598d190c03.tar.bz2 cbt-fdb5d7cdb692ded3ccc1d865282169598d190c03.zip | |
Merge pull request #138 from cvogt/chris
various changes
Diffstat (limited to 'stage2')
| -rw-r--r-- | stage2/Scaffold.scala | 3 | ||||
| -rw-r--r-- | stage2/ToolsTasks.scala | 2 | ||||
| -rw-r--r-- | stage2/plugins/Dotty.scala | 5 | ||||
| -rw-r--r-- | stage2/plugins/Frege.scala | 5 |
4 files changed, 7 insertions, 8 deletions
diff --git a/stage2/Scaffold.scala b/stage2/Scaffold.scala index 68a966b..4420866 100644 --- a/stage2/Scaffold.scala +++ b/stage2/Scaffold.scala @@ -62,7 +62,7 @@ object Main{ createFile(projectDirectory, lib.buildDirectoryName++"/"++lib.buildFileName, s"""package cbt_build.${packageFromDirectory(projectDirectory)} import cbt._ class Build(val context: Context) extends BaseBuild{ - override def dependencies = + override def dependencies = ( super.dependencies ++ // don't forget super.dependencies here for scala-library, etc. Seq( // source dependency @@ -78,6 +78,7 @@ class Build(val context: Context) extends BaseBuild{ // "com.lihaoyi" %% "ammonite-ops" % "0.5.5" // "com.lihaoyi" % "ammonite-ops_2.11" % "0.5.5" ) + ) } """ ) diff --git a/stage2/ToolsTasks.scala b/stage2/ToolsTasks.scala index 943f096..0cfd501 100644 --- a/stage2/ToolsTasks.scala +++ b/stage2/ToolsTasks.scala @@ -30,7 +30,7 @@ class ToolsTasks( args(1).split(",").toVector.map{ d => val v = d.split(":") - Resolver(mavenCentral).bindOne(MavenDependency(v(0),v(1),v(2))).classpath + Resolver(mavenCentral, sonatypeSnapshots).bindOne(MavenDependency(v(0),v(1),v(2))).classpath } ) } 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._ |