From 8f3101566c618b83b6b64974c0aa173fbabd1af3 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Mon, 6 Mar 2017 21:51:28 -0500 Subject: make sure binary dependencies exist --- stage1/cbt.scala | 2 ++ stage1/resolver.scala | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'stage1') diff --git a/stage1/cbt.scala b/stage1/cbt.scala index 0305dd2..062e11d 100644 --- a/stage1/cbt.scala +++ b/stage1/cbt.scala @@ -61,6 +61,8 @@ object `package`{ ) } + def lastModifiedRecursive = listRecursive.map(_.lastModified).max + def readAsString = new String( readAllBytes( file.toPath ) ) } implicit class URLExtensionMethods( url: URL ){ diff --git a/stage1/resolver.scala b/stage1/resolver.scala index 6e7ec09..86cf5ab 100644 --- a/stage1/resolver.scala +++ b/stage1/resolver.scala @@ -154,8 +154,9 @@ class ScalaDependencies(cbtLastModified: Long, mavenCache: File, version: String case class BinaryDependency( paths: Seq[File], dependencies: Seq[Dependency] )(implicit val logger: Logger, val transientCache: java.util.Map[AnyRef,AnyRef], val classLoaderCache: ClassLoaderCache) extends DependencyImplementation{ assert(paths.nonEmpty) + paths.foreach(p => assert(p.exists)) def exportedClasspath = ClassPath(paths) - override def lastModified = paths.map(_.lastModified).maxOption.getOrElse(0) // FIXME: cache this + override def lastModified = paths.map(_.lastModifiedRecursive).max // FIXME: cache this def targetClasspath = exportedClasspath def moduleKey = this.getClass.getName ++ "(" ++ paths.mkString(", ") ++ ")" } -- cgit v1.2.3