diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala index 0230b5791..cc1a2eda0 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala @@ -19,8 +19,7 @@ import org.apache.ivy.plugins.resolver.{ BasicResolver, DependencyResolver } import sbt.io.{ IO, PathFinder } import sbt.util.{ Logger, ShowLines } import sbt.internal.util.{ SourcePosition, LinePosition, RangePosition, LineRange } -import sbt.librarymanagement._ -import sbt.internal.librarymanagement.syntax._ +import sbt.librarymanagement._, syntax._ final class DeliverConfiguration(val deliverIvyPattern: String, val status: String, val configurations: Option[Vector[Configuration]], val logging: UpdateLogging) final class PublishConfiguration(val ivyFile: Option[File], val resolverName: String, val artifacts: Map[Artifact, File], val checksums: Vector[String], val logging: UpdateLogging, diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala index 2c8ef1049..fa55c51e3 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala @@ -13,8 +13,7 @@ import report.{ ArtifactDownloadReport, ConfigurationResolveReport, ResolveRepor import resolve.{ IvyNode, IvyNodeCallers } import IvyNodeCallers.{ Caller => IvyCaller } import ivyint.SbtDefaultDependencyDescriptor -import sbt.librarymanagement._ -import sbt.internal.librarymanagement.syntax._ +import sbt.librarymanagement._, syntax._ object IvyRetrieve { def reports(report: ResolveReport): Vector[ConfigurationResolveReport] = diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala index ddff21597..7159e33e9 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala @@ -22,8 +22,7 @@ import annotation.tailrec import scala.concurrent.duration._ import sbt.io.{ DirectoryFilter, Hash, IO } import sbt.util.Logger -import sbt.librarymanagement._ -import sbt.internal.librarymanagement.syntax._ +import sbt.librarymanagement._, syntax._ import sbt.internal.util.CacheStore private[sbt] object CachedResolutionResolveCache { diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/syntax.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/syntax.scala deleted file mode 100644 index 4ddc5d243..000000000 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/syntax.scala +++ /dev/null @@ -1,10 +0,0 @@ -package sbt -package internal -package librarymanagement - -import sbt.librarymanagement._ - -object syntax { - implicit def richUpateReport(ur: UpdateReport): RichUpdateReport = - new RichUpdateReport(ur) -} diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala new file mode 100644 index 000000000..e6c43d872 --- /dev/null +++ b/librarymanagement/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala @@ -0,0 +1,7 @@ +package sbt.librarymanagement + +trait LibraryManagementSyntax { + implicit def richUpdateReport(ur: UpdateReport): RichUpdateReport = new RichUpdateReport(ur) +} + +object syntax extends LibraryManagementSyntax