diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-06 21:51:28 -0500 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-07 06:20:34 -0500 |
| commit | 8f3101566c618b83b6b64974c0aa173fbabd1af3 (patch) | |
| tree | a0a6cfc18123a202d97205a19fb7bcfa1d4f493b /stage1 | |
| parent | 683d25d790dbd288ec52cab775931970aad7bae1 (diff) | |
| download | cbt-8f3101566c618b83b6b64974c0aa173fbabd1af3.tar.gz cbt-8f3101566c618b83b6b64974c0aa173fbabd1af3.tar.bz2 cbt-8f3101566c618b83b6b64974c0aa173fbabd1af3.zip | |
make sure binary dependencies exist
Diffstat (limited to 'stage1')
| -rw-r--r-- | stage1/cbt.scala | 2 | ||||
| -rw-r--r-- | stage1/resolver.scala | 3 |
2 files changed, 4 insertions, 1 deletions
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(", ") ++ ")" } |