From 14f7177619deb9f7d99c17d5187160584dac1cb2 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Thu, 8 Aug 2019 10:06:16 -0700 Subject: [PATCH 1/2] Fix implicit numeric widening warning --- main/src/main/scala/sbt/internal/SysProp.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/internal/SysProp.scala b/main/src/main/scala/sbt/internal/SysProp.scala index 81bb987f1..fa34b7822 100644 --- a/main/src/main/scala/sbt/internal/SysProp.scala +++ b/main/src/main/scala/sbt/internal/SysProp.scala @@ -87,7 +87,7 @@ object SysProp { def closeClassLoaders: Boolean = getOrTrue("sbt.classloader.close") def fileCacheSize: Long = - SizeParser(System.getProperty("sbt.file.cache.size", "128M")).getOrElse(128 * 1024 * 1024) + SizeParser(System.getProperty("sbt.file.cache.size", "128M")).getOrElse(128L * 1024 * 1024) def supershell: Boolean = color && getOrTrue("sbt.supershell") def supershellSleep: Long = long("sbt.supershell.sleep", 100L) From 9a1d874c374d38dcc37fa0060ce43e0c80ba8198 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Thu, 8 Aug 2019 10:18:43 -0700 Subject: [PATCH 2/2] Fix divide by zero --- project/Scripted.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Scripted.scala b/project/Scripted.scala index 2b4276a8d..67194b2cf 100644 --- a/project/Scripted.scala +++ b/project/Scripted.scala @@ -60,7 +60,7 @@ object Scripted { // Grabs the filenames from a given test group in the current page definition. def pagedFilenames(group: String, page: ScriptedTestPage): Seq[String] = { val files = pairMap(group).toSeq.sortBy(_.toLowerCase) - val pageSize = files.size / page.total + val pageSize = if (page.total == 0) files.size else files.size / page.total // The last page may loose some values, so we explicitly keep them val dropped = files.drop(pageSize * (page.page - 1)) if (page.page == page.total) dropped