From 5704e3125675ec2adb99645529b2ed10b3980c0a Mon Sep 17 00:00:00 2001 From: Peter Vlugter Date: Thu, 13 Nov 2014 19:18:52 +1300 Subject: [PATCH] Fix sbinary cache limit when caching doc inputs Cache the classpath as Seq[File] rather than String in RawCompileLike. --- main/actions/src/main/scala/sbt/RawCompileLike.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/actions/src/main/scala/sbt/RawCompileLike.scala b/main/actions/src/main/scala/sbt/RawCompileLike.scala index 0a4f7e0db..b538437da 100644 --- a/main/actions/src/main/scala/sbt/RawCompileLike.scala +++ b/main/actions/src/main/scala/sbt/RawCompileLike.scala @@ -38,8 +38,8 @@ object RawCompileLike { def cached(cache: File, doCompile: Gen): Gen = cached(cache, Seq(), doCompile) def cached(cache: File, fileInputOpts: Seq[String], doCompile: Gen): Gen = (sources, classpath, outputDirectory, options, maxErrors, log) => { - type Inputs = FilesInfo[HashFileInfo] :+: FilesInfo[ModifiedFileInfo] :+: String :+: File :+: Seq[String] :+: Int :+: HNil - val inputs: Inputs = hash(sources.toSet ++ optionFiles(options, fileInputOpts)) :+: lastModified(classpath.toSet) :+: classpath.absString :+: outputDirectory :+: options :+: maxErrors :+: HNil + type Inputs = FilesInfo[HashFileInfo] :+: FilesInfo[ModifiedFileInfo] :+: Seq[File] :+: File :+: Seq[String] :+: Int :+: HNil + val inputs: Inputs = hash(sources.toSet ++ optionFiles(options, fileInputOpts)) :+: lastModified(classpath.toSet) :+: classpath :+: outputDirectory :+: options :+: maxErrors :+: HNil implicit val stringEquiv: Equiv[String] = defaultEquiv implicit val fileEquiv: Equiv[File] = defaultEquiv implicit val intEquiv: Equiv[Int] = defaultEquiv