From caecbbabe77d3527e7314fd7d29ce8ed176786e2 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 15 Feb 2017 23:12:01 -0500 Subject: [PATCH] util 1.0.0-M19 --- .../scala/sbt/internal/librarymanagement/IvyActions.scala | 4 ++-- .../main/scala/sbt/librarymanagement/EvictionWarning.scala | 2 +- project/Dependencies.scala | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala index 13a5d040b..2157f9113 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala @@ -17,8 +17,8 @@ import org.apache.ivy.core.report.ResolveReport import org.apache.ivy.core.resolve.ResolveOptions import org.apache.ivy.plugins.resolver.{ BasicResolver, DependencyResolver } import sbt.io.{ IO, PathFinder } -import sbt.util.Logger -import sbt.internal.util.{ ShowLines, SourcePosition, LinePosition, RangePosition, LineRange } +import sbt.util.{ Logger, ShowLines } +import sbt.internal.util.{ SourcePosition, LinePosition, RangePosition, LineRange } import sbt.librarymanagement._ import sbt.internal.librarymanagement.syntax._ import sbt.internal.librarymanagement._ diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala index dde946c1f..853efa332 100644 --- a/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala +++ b/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala @@ -4,7 +4,7 @@ import collection.mutable import Configurations.Compile import ScalaArtifacts.{ LibraryID, CompilerID } import sbt.util.Logger -import sbt.internal.util.ShowLines +import sbt.util.ShowLines import sbt.internal.librarymanagement.{ InlineConfiguration, IvySbt } final class EvictionWarningOptions private[sbt] ( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 82c63e485..d73001e7e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ object Dependencies { val scala212 = "2.12.1" private val ioVersion = "1.0.0-M9" - private val utilVersion = "1.0.0-M18" + private val utilVersion = "1.0.0-M19" private val sbtIO = "org.scala-sbt" %% "io" % ioVersion