diff --git a/build.sbt b/build.sbt index 51174f5aa..6c5bc4a55 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ import Sxr.sxr // but can be shared across the multi projects. def buildLevelSettings: Seq[Setting[_]] = inThisBuild(Seq( organization := "org.scala-sbt", - version := "0.13.15-SNAPSHOT", + version := "0.13.16-SNAPSHOT", bintrayOrganization := Some(if (publishStatus.value == "releases") "typesafe" else "sbt"), bintrayRepository := s"ivy-${publishStatus.value}", bintrayPackage := "sbt", diff --git a/main/actions/src/main/scala/sbt/Sync.scala b/main/actions/src/main/scala/sbt/Sync.scala index 7e0f9f062..8d3f8b8d9 100644 --- a/main/actions/src/main/scala/sbt/Sync.scala +++ b/main/actions/src/main/scala/sbt/Sync.scala @@ -68,6 +68,7 @@ object Sync { } import java.io.{ File, IOException } + import java.util.zip.ZipException import sbinary._ import Operations.{ read, write } import DefaultProtocol.{ FileFormat => _, _ } @@ -82,7 +83,15 @@ object Sync { def readInfo[F <: FileInfo](file: File)(implicit infoFormat: Format[F]): RelationInfo[F] = try { readUncaught(file)(infoFormat) } - catch { case e: IOException => (Relation.empty, Map.empty) } + catch { + case e: IOException => (Relation.empty, Map.empty) + case e: ZipException => (Relation.empty, Map.empty) + case e: TranslatedException => + e.getCause match { + case e: ZipException => (Relation.empty, Map.empty) + case _ => throw e + } + } def readUncaught[F <: FileInfo](file: File)(implicit infoFormat: Format[F]): RelationInfo[F] = IO.gzipFileIn(file) { in =>