bump to up Util 0.1.0-M3

2015-09-07 02:59:23 -04:00 · 2015-09-07 02:59:23 -04:00 · c65c5016b0
parent a30bcdbb37
commit c65c5016b0
21 changed files with 26 additions and 21 deletions
--- a/librarymanagement/src/main/scala/sbt/ComponentManager.scala
+++ b/librarymanagement/src/main/scala/sbt/ComponentManager.scala
@ -5,7 +5,7 @@ package sbt

 import java.io.{ File, FileOutputStream }
 import java.util.concurrent.Callable
-import sbt.internal.util.Logger
+import sbt.util.Logger

 /**
 * A component manager provides access to the pieces of xsbt that are distributed as components.
--- a/librarymanagement/src/main/scala/sbt/ConflictWarning.scala
+++ b/librarymanagement/src/main/scala/sbt/ConflictWarning.scala
@ -1,7 +1,7 @@
 package sbt

 import DependencyFilter._
-import sbt.internal.util.{ Logger, Level }
+import sbt.util.{ Logger, Level }

 /**
 * Provide warnings for cross version conflicts.
--- a/librarymanagement/src/main/scala/sbt/ConvertResolver.scala
+++ b/librarymanagement/src/main/scala/sbt/ConvertResolver.scala
@ -18,7 +18,7 @@ import java.io.{ IOException, File }
 import org.apache.ivy.util.{ FileUtil, ChecksumHelper }
 import org.apache.ivy.core.module.descriptor.{ Artifact => IArtifact }
 import sbt.io.IO
-import sbt.internal.util.Logger
+import sbt.util.Logger

 private[sbt] object ConvertResolver {
  import UpdateOptions.ResolverConverter
--- a/librarymanagement/src/main/scala/sbt/Credentials.scala
+++ b/librarymanagement/src/main/scala/sbt/Credentials.scala
@ -6,7 +6,7 @@ package sbt
 import java.io.File
 import org.apache.ivy.util.url.CredentialsStore
 import sbt.io.IO
-import sbt.internal.util.Logger
+import sbt.util.Logger

 object Credentials {
  def apply(realm: String, host: String, userName: String, passwd: String): Credentials =
--- a/librarymanagement/src/main/scala/sbt/EvictionWarning.scala
+++ b/librarymanagement/src/main/scala/sbt/EvictionWarning.scala
@ -3,7 +3,8 @@ package sbt
 import collection.mutable
 import Configurations.Compile
 import ScalaArtifacts.{ LibraryID, CompilerID }
-import sbt.internal.util.{ Logger, ShowLines }
+import sbt.util.Logger
+import sbt.internal.util.ShowLines

 final class EvictionWarningOptions private[sbt] (
    val configurations: Seq[Configuration],
--- a/librarymanagement/src/main/scala/sbt/Ivy.scala
+++ b/librarymanagement/src/main/scala/sbt/Ivy.scala
@ -39,7 +39,7 @@ import org.apache.ivy.util.extendable.ExtendableItem
 import scala.xml.{ NodeSeq, Text }
 import scala.collection.mutable

-import sbt.internal.util.Logger
+import sbt.util.Logger

 final class IvySbt(val configuration: IvyConfiguration) {
  import configuration.baseDirectory
--- a/librarymanagement/src/main/scala/sbt/IvyActions.scala
+++ b/librarymanagement/src/main/scala/sbt/IvyActions.scala
@ -17,7 +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.internal.util.{ Logger, ShowLines, SourcePosition, LinePosition, RangePosition, LineRange }
+import sbt.util.Logger
+import sbt.internal.util.{ ShowLines, SourcePosition, LinePosition, RangePosition, LineRange }

 final class DeliverConfiguration(val deliverIvyPattern: String, val status: String, val configurations: Option[Seq[Configuration]], val logging: UpdateLogging.Value)
 final class PublishConfiguration(val ivyFile: Option[File], val resolverName: String, val artifacts: Map[Artifact, File], val checksums: Seq[String], val logging: UpdateLogging.Value,
--- a/librarymanagement/src/main/scala/sbt/IvyCache.scala
+++ b/librarymanagement/src/main/scala/sbt/IvyCache.scala
@ -13,7 +13,7 @@ import org.apache.ivy.plugins.repository.{ ArtifactResourceResolver, Resource, R
 import org.apache.ivy.plugins.resolver.util.ResolvedResource
 import org.apache.ivy.util.FileUtil
 import sbt.io.Path
-import sbt.internal.util.Logger
+import sbt.util.Logger

 class NotInCache(val id: ModuleID, cause: Throwable)
    extends RuntimeException(NotInCache(id, cause), cause) {
--- a/librarymanagement/src/main/scala/sbt/IvyConfigurations.scala
+++ b/librarymanagement/src/main/scala/sbt/IvyConfigurations.scala
@ -6,7 +6,7 @@ package sbt
 import java.io.File
 import java.net.{ URI, URL }
 import scala.xml.NodeSeq
-import sbt.internal.util.Logger
+import sbt.util.Logger

 final class IvyPaths(val baseDirectory: File, val ivyHome: Option[File]) {
  def withBase(newBaseDirectory: File) = new IvyPaths(newBaseDirectory, ivyHome)
--- a/librarymanagement/src/main/scala/sbt/IvyLogger.scala
+++ b/librarymanagement/src/main/scala/sbt/IvyLogger.scala
@ -4,7 +4,7 @@
 package sbt

 import org.apache.ivy.util.{ Message, MessageLogger, MessageLoggerEngine }
-import sbt.internal.util.Logger
+import sbt.util.Logger

 /** Interface to Ivy logging. */
 private final class IvyLoggerInterface(logger: Logger) extends MessageLogger {
--- a/librarymanagement/src/main/scala/sbt/IvyScala.scala
+++ b/librarymanagement/src/main/scala/sbt/IvyScala.scala
@ -11,7 +11,7 @@ import org.apache.ivy.core.module.descriptor.{ DependencyDescriptor, DefaultModu
 import org.apache.ivy.core.module.id.{ ArtifactId, ModuleId, ModuleRevisionId }
 import org.apache.ivy.plugins.matcher.ExactPatternMatcher

-import sbt.internal.util.Logger
+import sbt.util.Logger

 object ScalaArtifacts {
  val Organization = "org.scala-lang"
--- a/librarymanagement/src/main/scala/sbt/JsonUtil.scala
+++ b/librarymanagement/src/main/scala/sbt/JsonUtil.scala
@ -6,7 +6,7 @@ import org.apache.ivy.core
 import core.module.descriptor.ModuleDescriptor
 import sbt.serialization._
 import java.net.{ URLEncoder, URLDecoder }
-import sbt.internal.util.Logger
+import sbt.util.Logger

 private[sbt] object JsonUtil {
  def sbtOrgTemp = "org.scala-sbt.temp"
--- a/librarymanagement/src/main/scala/sbt/MakePom.scala
+++ b/librarymanagement/src/main/scala/sbt/MakePom.scala
@ -8,7 +8,7 @@
 package sbt

 import java.io.File
-import sbt.internal.util.Logger
+import sbt.util.Logger

 import sbt.mavenint.PomExtraDependencyAttributes

--- a/librarymanagement/src/main/scala/sbt/UpdateOptions.scala
+++ b/librarymanagement/src/main/scala/sbt/UpdateOptions.scala
@ -3,7 +3,7 @@ package sbt
 import java.io.File
 import org.apache.ivy.plugins.resolver.DependencyResolver
 import org.apache.ivy.core.settings.IvySettings
-import sbt.internal.util.Logger
+import sbt.util.Logger

 /**
 * Represents configurable options for update task.
--- a/librarymanagement/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala
+++ b/librarymanagement/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala
@ -23,7 +23,7 @@ import Configurations.{ System => _, _ }
 import annotation.tailrec
 import scala.concurrent.duration._
 import sbt.io.{ DirectoryFilter, Hash, IO, Path }
-import sbt.internal.util.Logger
+import sbt.util.Logger

 private[sbt] object CachedResolutionResolveCache {
  def createID(organization: String, name: String, revision: String) =
--- a/librarymanagement/src/main/scala/sbt/ivyint/SbtChainResolver.scala
+++ b/librarymanagement/src/main/scala/sbt/ivyint/SbtChainResolver.scala
@ -15,7 +15,7 @@ import org.apache.ivy.plugins.repository.url.URLResource
 import org.apache.ivy.plugins.resolver._
 import org.apache.ivy.plugins.resolver.util.{ HasLatestStrategy, ResolvedResource }
 import org.apache.ivy.util.{ Message, StringUtils => IvyStringUtils }
-import sbt.internal.util.Logger
+import sbt.util.Logger

 private[sbt] case class SbtChainResolver(
    name: String,
--- a/librarymanagement/src/test/scala/BaseIvySpecification.scala
+++ b/librarymanagement/src/test/scala/BaseIvySpecification.scala
@ -5,7 +5,8 @@ import sbt.io.IO
 import java.io.File
 import cross.CrossVersionUtil
 import sbt.ivyint.SbtChainResolver
-import sbt.internal.util.{ Logger, ConsoleLogger }
+import sbt.util.Logger
+import sbt.internal.util.ConsoleLogger
 import sbt.internal.util.UnitSpec

 trait BaseIvySpecification extends UnitSpec {
--- a/librarymanagement/src/test/scala/ComponentManagerTest.scala
+++ b/librarymanagement/src/test/scala/ComponentManagerTest.scala
@ -7,7 +7,7 @@ import sbt.io.IO
 import org.apache.ivy.util.ChecksumHelper
 import IfMissing.Fail
 import xsbti.ComponentProvider
-import sbt.internal.util.Logger
+import sbt.util.Logger
 import sbt.internal.util.{ UnitSpec, TestLogger }

 // TODO - We need to re-enable this test.  Right now, we dont' have a "stub" launcher for this.
--- a/librarymanagement/src/test/scala/CustomPomParserTest.scala
+++ b/librarymanagement/src/test/scala/CustomPomParserTest.scala
@ -4,7 +4,8 @@ import org.apache.ivy.core.module.id.ModuleRevisionId
 import org.apache.ivy.core.resolve.ResolveOptions
 import sbt._
 import sbt.io.IO.withTemporaryDirectory
-import sbt.internal.util.{ Logger, ConsoleLogger }
+import sbt.util.Logger
+import sbt.internal.util.ConsoleLogger
 import sbt.internal.util.UnitSpec

 class CustomPomParserTest extends UnitSpec {
--- a/librarymanagement/src/test/scala/MakePomSpec.scala
+++ b/librarymanagement/src/test/scala/MakePomSpec.scala
@ -1,7 +1,8 @@
 package sbt

 import java.io.File
-import sbt.internal.util.{ Logger, ConsoleLogger }
+import sbt.util.Logger
+import sbt.internal.util.ConsoleLogger
 import sbt.internal.util.UnitSpec

 // http://ant.apache.org/ivy/history/2.3.0/ivyfile/dependency.html
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@ -5,7 +5,7 @@ object Dependencies {
  lazy val scala210 = "2.10.5"
  lazy val scala211 = "2.11.7"

-  val utilVersion = "0.1.0-M2"
+  val utilVersion = "0.1.0-M3"
  val ioVersion = "1.0.0-M3"
  lazy val sbtIO = "org.scala-sbt" %% "io" % ioVersion
  lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion