From 98e56e5773cc3dd4fe5b3f6f44b043c965c441ae Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Sat, 12 Mar 2016 20:29:57 -0500 Subject: sort transitiveDependencies by exported classpath for hopefully more determinism between dev machines and circle ci --- stage2/BasicBuild.scala | 1 + stage2/BuildDependency.scala | 1 + 2 files changed, 2 insertions(+) (limited to 'stage2') diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index 07c2c1e..93a55ca 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -118,6 +118,7 @@ class Build(val context: Context) extends Dependency with TriggerLoop{ override def dependencyJars : Seq[File] = localJars ++ super.dependencyJars def exportedClasspath : ClassPath = ClassPath(Seq(compile)) + def targetClasspath = ClassPath(Seq(compileTarget)) def exportedJars: Seq[File] = Seq() // ========== compile, run, test ========== diff --git a/stage2/BuildDependency.scala b/stage2/BuildDependency.scala index f400be7..84a0100 100644 --- a/stage2/BuildDependency.scala +++ b/stage2/BuildDependency.scala @@ -26,6 +26,7 @@ case class BuildDependency(context: Context) extends TriggerLoop{ def dependencies = Seq(build) def triggerLoopFiles = root.triggerLoopFiles final val updated = build.updated + def targetClasspath = ClassPath(Seq()) } /* case class DependencyOr(first: BuildDependency, second: JavaDependency) extends ProjectProxy with BuildDependencyBase{ -- cgit v1.2.3