Merge branch '1.x' into readable-logs

sbt · Jun 20, 2018 · 4950082 · 4950082
2 parents 9a23c95 + 5f8c4f5
commit 4950082
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
 

diff --git 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.")
     }
   }