From 509c80c8a704e0bac9625f6040d5ffa4cdfb9bff Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 15 Jul 2017 13:52:10 -0400 Subject: [PATCH] Bump to latest IO and Util --- .../main/scala/sbt/internal/librarymanagement/IvyCache.scala | 2 +- ivy/src/test/scala/DMSerializationSpec.scala | 2 +- project/Dependencies.scala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/IvyCache.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/IvyCache.scala index cdabbd94c..c17aa283d 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/IvyCache.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/IvyCache.scala @@ -20,7 +20,7 @@ import sbt.librarymanagement._ import sbt.librarymanagement.ivy.{ InlineIvyConfiguration, IvyPaths } import sbt.util.Logger -import scalajson.ast.unsafe._ +import sjsonnew.shaded.scalajson.ast.unsafe._ import scala.collection.mutable import jawn.{ SupportParser, MutableFacade } diff --git a/ivy/src/test/scala/DMSerializationSpec.scala b/ivy/src/test/scala/DMSerializationSpec.scala index d38c8fcdb..937fa3537 100644 --- a/ivy/src/test/scala/DMSerializationSpec.scala +++ b/ivy/src/test/scala/DMSerializationSpec.scala @@ -4,7 +4,7 @@ import java.net.URL import java.io.File import sbt.internal._, librarymanagement._ -import scalajson.ast.unsafe._ +import sjsonnew.shaded.scalajson.ast.unsafe._ import sjsonnew._, support.scalajson.unsafe._ import org.scalatest.Assertion diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 264d23e13..57048034a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,8 +6,8 @@ object Dependencies { val scala211 = "2.11.11" val scala212 = "2.12.2" - private val ioVersion = "1.0.0-M12" - private val utilVersion = "1.0.0-M26" + private val ioVersion = "1.0.0-M13" + private val utilVersion = "1.0.0-M27" private val sbtIO = "org.scala-sbt" %% "io" % ioVersion