luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4862 from eatkins/fix-warnings 

Fix warnings
This commit is contained in:
eugene yokota 2019-07-15 12:57:16 -04:00 committed by GitHub
parent 82299c89ed 055d7cd626
commit a6da4b5b90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/util-complete/src/main/scala/sbt/internal/util/complete/SizeParser.scala
View File

@ -47,10 +47,10 @@ private[sbt] object SizeParser {
.map {
case (number, unit) =>
unit match {
case None | Some(Bytes) => multiply(number, right = 1)
case Some(KiloBytes) => multiply(number, right = 1024)
case Some(MegaBytes) => multiply(number, right = 1024 * 1024)
case Some(GigaBytes) => multiply(number, right = 1024 * 1024 * 1024)
case None | Some(Bytes) => multiply(number, right = 1L)
case Some(KiloBytes) => multiply(number, right = 1024L)
case Some(MegaBytes) => multiply(number, right = 1024L * 1024)
case Some(GigaBytes) => multiply(number, right = 1024L * 1024 * 1024)
}
}
}

4
main/src/main/scala/sbt/internal/InMemoryCacheStore.scala
View File

@ -56,8 +56,8 @@ private[sbt] object InMemoryCacheStore {
override def read[T]()(implicit reader: JsonReader[T]): T = {
val lastModified = IO.getModifiedTimeOrZero(path.toFile)
store.get[T](path) match {
case Some((value: T, `lastModified`)) => value
case _ => cacheStore.read[T]()
case Some((value, `lastModified`)) => value
case _ => cacheStore.read[T]()
}
}
override def write[T](value: T)(implicit writer: JsonWriter[T]): Unit = {