From 25904681b2b9eed750157840ace4cf208c433a41 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 18 Jun 2018 10:47:26 -0400 Subject: [PATCH 1/2] Make CachedHashingSpec more lenient Fixes https://github.com/sbt/zinc/issues/552 The 20% assersion is failing often. --- zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala b/zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala index 9f20505d82..f43eae172d 100644 --- a/zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala +++ b/zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala @@ -58,8 +58,8 @@ class CachedHashingSpec extends BaseCompilerSpec { val hashingTime = timeMs(genConfig) val cachedHashingTime = timeMs(genConfig) - assert(cachedHashingTime < (hashingTime * 0.20), - s"Cache jar didn't work: $cachedHashingTime is >= than 20% of $hashingTime.") + assert(cachedHashingTime < (hashingTime * 0.50), + s"Cache jar didn't work: $cachedHashingTime is >= than 50% of $hashingTime.") } } From 646432ecea6f25c68f07568143541e1e4cb157ed Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 18 Jun 2018 10:54:15 -0400 Subject: [PATCH 2/2] Bump modules to 1.2.0-M1 --- project/Dependencies.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 103769c6b4..191ee17259 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,9 +7,9 @@ object Dependencies { val scala212 = "2.12.6" val scala213 = "2.13.0-M2" - private val ioVersion = "1.1.4" - private val utilVersion = "1.1.3" - private val lmVersion = "1.1.4" + private val ioVersion = "1.2.0-M1" + private val utilVersion = "1.2.0-M1" + private val lmVersion = "1.2.0-M1" private val sbtIO = "org.scala-sbt" %% "io" % ioVersion