From df7e529a5991cd72829bd071477fc337d1865ad9 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 20 Nov 2018 10:53:40 +0100 Subject: [PATCH] Adjust namespace --- .../lmcoursier}/CoursierConfiguration.scala | 4 ++-- .../lmcoursier}/CoursierConfigurationFormats.scala | 10 +++++----- .../lm-coursier/src/main/contraband/lm-coursier.json | 4 ++-- .../{sbtcoursier => lmcoursier}/ArtifactsParams.scala | 2 +- .../{sbtcoursier => lmcoursier}/ArtifactsRun.scala | 2 +- .../lmcoursier}/CoursierDependencyResolution.scala | 3 +-- .../lmcoursier}/CoursierLibraryManagementCodec.scala | 5 +++-- .../lmcoursier}/CoursierModuleDescriptor.scala | 4 ++-- .../lmcoursier}/CoursierModuleSettings.scala | 2 +- .../lmcoursier}/CustomLibraryManagementCodec.scala | 2 +- .../coursier/{sbtcoursier => lmcoursier}/FromSbt.scala | 2 +- .../coursier/{sbtcoursier => lmcoursier}/Inputs.scala | 2 +- .../InterProjectRepository.scala | 2 +- .../coursier/{sbtcoursier => lmcoursier}/Lock.scala | 2 +- .../{sbtcoursier => lmcoursier}/ResolutionError.scala | 2 +- .../ResolutionException.scala | 2 +- .../{sbtcoursier => lmcoursier}/ResolutionParams.scala | 2 +- .../{sbtcoursier => lmcoursier}/ResolutionRun.scala | 2 +- .../coursier => coursier/lmcoursier}/Resolvers.scala | 2 +- .../{sbtcoursier => lmcoursier}/SbtBootJars.scala | 2 +- .../{sbtcoursier => lmcoursier}/SbtCoursierCache.scala | 2 +- .../coursier/{sbtcoursier => lmcoursier}/ToSbt.scala | 2 +- .../{sbtcoursier => lmcoursier}/UpdateParams.scala | 2 +- .../{sbtcoursier => lmcoursier}/UpdateRun.scala | 2 +- .../lmcoursier}/ResolutionSpec.scala | 2 +- .../scala/coursier/sbtcoursier/ArtifactsTasks.scala | 1 + .../scala/coursier/sbtcoursier/CoursierPlugin.scala | 1 + .../main/scala/coursier/sbtcoursier/DisplayTasks.scala | 1 + .../main/scala/coursier/sbtcoursier/InputsTasks.scala | 1 + .../scala/coursier/sbtcoursier/RepositoriesTasks.scala | 1 + .../scala/coursier/sbtcoursier/ResolutionTasks.scala | 1 + .../main/scala/coursier/sbtcoursier/UpdateTasks.scala | 1 + .../clean/project/{helper.scala => Helper.scala} | 4 ++-- 33 files changed, 43 insertions(+), 36 deletions(-) rename modules/lm-coursier/src/main/contraband-scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CoursierConfiguration.scala (94%) rename modules/lm-coursier/src/main/contraband-scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CoursierConfigurationFormats.scala (76%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ArtifactsParams.scala (94%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ArtifactsRun.scala (99%) rename modules/lm-coursier/src/main/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CoursierDependencyResolution.scala (96%) rename modules/lm-coursier/src/main/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CoursierLibraryManagementCodec.scala (83%) rename modules/lm-coursier/src/main/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CoursierModuleDescriptor.scala (83%) rename modules/lm-coursier/src/main/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CoursierModuleSettings.scala (72%) rename modules/lm-coursier/src/main/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CustomLibraryManagementCodec.scala (95%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/FromSbt.scala (99%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/Inputs.scala (99%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/InterProjectRepository.scala (95%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/Lock.scala (89%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ResolutionError.scala (99%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ResolutionException.scala (88%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ResolutionParams.scala (99%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ResolutionRun.scala (99%) rename modules/lm-coursier/src/main/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/Resolvers.scala (97%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/SbtBootJars.scala (94%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/SbtCoursierCache.scala (98%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ToSbt.scala (99%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/UpdateParams.scala (94%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/UpdateRun.scala (99%) rename modules/lm-coursier/src/test/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/ResolutionSpec.scala (99%) rename modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/{helper.scala => Helper.scala} (52%) diff --git a/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala b/modules/lm-coursier/src/main/contraband-scala/coursier/lmcoursier/CoursierConfiguration.scala similarity index 94% rename from modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala rename to modules/lm-coursier/src/main/contraband-scala/coursier/lmcoursier/CoursierConfiguration.scala index 9ee641e34..138d8d99a 100644 --- a/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala +++ b/modules/lm-coursier/src/main/contraband-scala/coursier/lmcoursier/CoursierConfiguration.scala @@ -3,7 +3,7 @@ */ // DO NOT EDIT MANUALLY -package sbt.librarymanagement.coursier +package coursier.lmcoursier final class CoursierConfiguration private ( val log: Option[xsbti.Logger], val resolvers: Vector[sbt.librarymanagement.Resolver], @@ -22,7 +22,7 @@ final class CoursierConfiguration private ( case _ => false } override def hashCode: Int = { - 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "sbt.librarymanagement.coursier.CoursierConfiguration".##) + log.##) + resolvers.##) + otherResolvers.##) + reorderResolvers.##) + parallelDownloads.##) + maxIterations.##) + sbtScalaOrganization.##) + sbtScalaVersion.##) + sbtScalaJars.##) + 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "coursier.lmcoursier.CoursierConfiguration".##) + log.##) + resolvers.##) + otherResolvers.##) + reorderResolvers.##) + parallelDownloads.##) + maxIterations.##) + sbtScalaOrganization.##) + sbtScalaVersion.##) + sbtScalaJars.##) } override def toString: String = { "CoursierConfiguration(" + log + ", " + resolvers + ", " + otherResolvers + ", " + reorderResolvers + ", " + parallelDownloads + ", " + maxIterations + ", " + sbtScalaOrganization + ", " + sbtScalaVersion + ", " + sbtScalaJars + ")" diff --git a/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala b/modules/lm-coursier/src/main/contraband-scala/coursier/lmcoursier/CoursierConfigurationFormats.scala similarity index 76% rename from modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala rename to modules/lm-coursier/src/main/contraband-scala/coursier/lmcoursier/CoursierConfigurationFormats.scala index 0dc5733b2..f394dfb87 100644 --- a/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala +++ b/modules/lm-coursier/src/main/contraband-scala/coursier/lmcoursier/CoursierConfigurationFormats.scala @@ -3,11 +3,11 @@ */ // DO NOT EDIT MANUALLY -package sbt.librarymanagement.coursier +package coursier.lmcoursier import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait CoursierConfigurationFormats { self: sbt.internal.librarymanagement.formats.LoggerFormat with sbt.librarymanagement.ResolverFormats with sjsonnew.BasicJsonProtocol => -implicit lazy val CoursierConfigurationFormat: JsonFormat[sbt.librarymanagement.coursier.CoursierConfiguration] = new JsonFormat[sbt.librarymanagement.coursier.CoursierConfiguration] { - override def read[J](jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.coursier.CoursierConfiguration = { +implicit lazy val CoursierConfigurationFormat: JsonFormat[coursier.lmcoursier.CoursierConfiguration] = new JsonFormat[coursier.lmcoursier.CoursierConfiguration] { + override def read[J](jsOpt: Option[J], unbuilder: Unbuilder[J]): coursier.lmcoursier.CoursierConfiguration = { jsOpt match { case Some(js) => unbuilder.beginObject(js) @@ -21,12 +21,12 @@ implicit lazy val CoursierConfigurationFormat: JsonFormat[sbt.librarymanagement. val sbtScalaVersion = unbuilder.readField[Option[String]]("sbtScalaVersion") val sbtScalaJars = unbuilder.readField[Vector[java.io.File]]("sbtScalaJars") unbuilder.endObject() - sbt.librarymanagement.coursier.CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations, sbtScalaOrganization, sbtScalaVersion, sbtScalaJars) + coursier.lmcoursier.CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations, sbtScalaOrganization, sbtScalaVersion, sbtScalaJars) case None => deserializationError("Expected JsObject but found None") } } - override def write[J](obj: sbt.librarymanagement.coursier.CoursierConfiguration, builder: Builder[J]): Unit = { + override def write[J](obj: coursier.lmcoursier.CoursierConfiguration, builder: Builder[J]): Unit = { builder.beginObject() builder.addField("log", obj.log) builder.addField("resolvers", obj.resolvers) diff --git a/modules/lm-coursier/src/main/contraband/lm-coursier.json b/modules/lm-coursier/src/main/contraband/lm-coursier.json index a5c7351ee..b86485a59 100644 --- a/modules/lm-coursier/src/main/contraband/lm-coursier.json +++ b/modules/lm-coursier/src/main/contraband/lm-coursier.json @@ -1,9 +1,9 @@ { - "codecNamespace": "sbt.librarymanagement.coursier", + "codecNamespace": "coursier.lmcoursier", "types": [ { "name": "CoursierConfiguration", - "namespace": "sbt.librarymanagement.coursier", + "namespace": "coursier.lmcoursier", "target": "Scala", "type": "record", "fields": [ diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsParams.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsParams.scala similarity index 94% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsParams.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsParams.scala index 9d03f2e85..6f9786624 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsParams.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsParams.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsRun.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsRun.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala index d24dd5cfb..60b63a501 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsRun.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File import java.util.concurrent.ExecutorService diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala similarity index 96% rename from modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala index 61c5e1691..6698042cd 100644 --- a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala @@ -1,11 +1,10 @@ -package sbt.librarymanagement.coursier +package coursier.lmcoursier import java.io.{File, OutputStreamWriter} import _root_.coursier.{Artifact, Cache, CachePolicy, FileError, Organization, Project, Resolution, TermDisplay, organizationString} import _root_.coursier.core.Configuration import _root_.coursier.ivy.IvyRepository -import _root_.coursier.sbtcoursier.{ArtifactsParams, ArtifactsRun, FromSbt, Inputs, InterProjectRepository, ResolutionError, ResolutionParams, ResolutionRun, SbtBootJars, UpdateParams, UpdateRun} import sbt.internal.librarymanagement.IvySbt import sbt.librarymanagement._ import sbt.util.Logger diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierLibraryManagementCodec.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierLibraryManagementCodec.scala similarity index 83% rename from modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierLibraryManagementCodec.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierLibraryManagementCodec.scala index 5bb0f26ba..b5cfc104d 100644 --- a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierLibraryManagementCodec.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierLibraryManagementCodec.scala @@ -1,5 +1,6 @@ -package sbt.librarymanagement -package coursier +package coursier.lmcoursier + +import sbt.librarymanagement.LibraryManagementCodec trait CoursierLibraryManagementCodec extends sjsonnew.BasicJsonProtocol diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleDescriptor.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierModuleDescriptor.scala similarity index 83% rename from modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleDescriptor.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierModuleDescriptor.scala index f3e52f2d4..4e8311045 100644 --- a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleDescriptor.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierModuleDescriptor.scala @@ -1,4 +1,4 @@ -package sbt.librarymanagement.coursier +package coursier.lmcoursier import sbt.librarymanagement._ import sjsonnew.support.murmurhash.Hasher @@ -18,7 +18,7 @@ final case class CoursierModuleDescriptor( CoursierModuleSettings() lazy val extraInputHash: Long = { - import sbt.librarymanagement.coursier.CustomLibraryManagementCodec._ + import CustomLibraryManagementCodec._ Hasher.hash(conf).toOption.fold(0L)(_.toLong) } } diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleSettings.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierModuleSettings.scala similarity index 72% rename from modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleSettings.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierModuleSettings.scala index cd3f0264c..a4d45fb3f 100644 --- a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleSettings.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierModuleSettings.scala @@ -1,4 +1,4 @@ -package sbt.librarymanagement.coursier +package coursier.lmcoursier import sbt.librarymanagement.ModuleSettings diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CustomLibraryManagementCodec.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CustomLibraryManagementCodec.scala similarity index 95% rename from modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CustomLibraryManagementCodec.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/CustomLibraryManagementCodec.scala index 68e443e83..0a608c129 100644 --- a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CustomLibraryManagementCodec.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CustomLibraryManagementCodec.scala @@ -1,4 +1,4 @@ -package sbt.librarymanagement.coursier +package coursier.lmcoursier import sbt.librarymanagement.Resolver import sjsonnew.JsonFormat diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/FromSbt.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/FromSbt.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/FromSbt.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/FromSbt.scala index f8f5e1ccc..e0a14a8d1 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/FromSbt.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/FromSbt.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import coursier.ivy.IvyRepository import coursier.ivy.IvyXml.{mappings => ivyXmlMappings} diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/Inputs.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/Inputs.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/Inputs.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/Inputs.scala index e7175397d..932bf680e 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/Inputs.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/Inputs.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import coursier.core.{Configuration, ModuleName, Organization, Project} import sbt.librarymanagement.{InclExclRule, ModuleID} diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/InterProjectRepository.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/InterProjectRepository.scala similarity index 95% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/InterProjectRepository.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/InterProjectRepository.scala index e1226c4c9..6748ea87d 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/InterProjectRepository.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/InterProjectRepository.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import coursier.Fetch import coursier.core._ diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/Lock.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/Lock.scala similarity index 89% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/Lock.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/Lock.scala index bbfb2c0a2..fd5e96ed3 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/Lock.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/Lock.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier object Lock { diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionError.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionError.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionError.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionError.scala index 629f10a6f..d61081277 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionError.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionError.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import coursier.FileError import coursier.core.Module diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionException.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionException.scala similarity index 88% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionException.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionException.scala index a600328d1..903dba9bc 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionException.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionException.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier final class ResolutionException( val error: ResolutionError diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionParams.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionParams.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionParams.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionParams.scala index cf01b8a95..e73ee3cdc 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionParams.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionParams.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File import java.net.URL diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionRun.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionRun.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala index 1a7bef161..256a5ece6 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionRun.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.util.concurrent.ExecutorService diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/Resolvers.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/Resolvers.scala similarity index 97% rename from modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/Resolvers.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/Resolvers.scala index ac656ac8a..ff65c2688 100644 --- a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/Resolvers.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/Resolvers.scala @@ -1,4 +1,4 @@ -package sbt.librarymanagement.coursier +package coursier.lmcoursier import sbt.librarymanagement.{ MavenRepository, Resolver, URLRepository } diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/SbtBootJars.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/SbtBootJars.scala similarity index 94% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/SbtBootJars.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/SbtBootJars.scala index 7adfae875..ea9be1d6f 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/SbtBootJars.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/SbtBootJars.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/SbtCoursierCache.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/SbtCoursierCache.scala similarity index 98% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/SbtCoursierCache.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/SbtCoursierCache.scala index e0de8ea5c..1c0959505 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/SbtCoursierCache.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/SbtCoursierCache.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.util.concurrent.ConcurrentHashMap diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ToSbt.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ToSbt.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ToSbt.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ToSbt.scala index 99d73aaf8..7ac41ac6d 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ToSbt.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ToSbt.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File import java.net.URL diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/UpdateParams.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/UpdateParams.scala similarity index 94% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/UpdateParams.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/UpdateParams.scala index fc7ee5b72..7700a75dd 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/UpdateParams.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/UpdateParams.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/UpdateRun.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/UpdateRun.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/UpdateRun.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/UpdateRun.scala index 5bc233e20..7ea5a1b78 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/UpdateRun.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/UpdateRun.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File diff --git a/modules/lm-coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala b/modules/lm-coursier/src/test/scala/coursier/lmcoursier/ResolutionSpec.scala similarity index 99% rename from modules/lm-coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala rename to modules/lm-coursier/src/test/scala/coursier/lmcoursier/ResolutionSpec.scala index 5772eb9d9..d034e7c11 100644 --- a/modules/lm-coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala +++ b/modules/lm-coursier/src/test/scala/coursier/lmcoursier/ResolutionSpec.scala @@ -1,4 +1,4 @@ -package sbt.librarymanagement.coursier +package coursier.lmcoursier import org.scalatest.{Matchers, PropSpec} import sbt.internal.librarymanagement.cross.CrossVersionUtil diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsTasks.scala index 7b190dbf0..15d261b92 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsTasks.scala @@ -4,6 +4,7 @@ import java.io.File import coursier.{Artifact, FileError} import coursier.core._ +import coursier.lmcoursier._ import coursier.sbtcoursier.Keys._ import coursier.sbtcoursier.Structure._ import sbt.librarymanagement.{Artifact => _, Configuration => _, _} diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala index a413561ad..63326c448 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala @@ -4,6 +4,7 @@ import java.io.OutputStreamWriter import coursier.{Cache, CachePolicy, TermDisplay} import coursier.core.{Configuration, ResolutionProcess} +import coursier.lmcoursier.SbtCoursierCache import sbt.librarymanagement.{Configuration => _, Resolver => _, _} import sbt.{Cache => _, Configuration => _, _} import sbt.Keys._ diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala index a47caa085..a949e43a2 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala @@ -1,6 +1,7 @@ package coursier.sbtcoursier import coursier.core._ +import coursier.lmcoursier._ import coursier.sbtcoursier.Keys._ import coursier.util.Print.Colors import coursier.util.{Parse, Print} diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/InputsTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/InputsTasks.scala index c75fb9847..28d6cf9c8 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/InputsTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/InputsTasks.scala @@ -4,6 +4,7 @@ import java.net.URL import coursier.ProjectCache import coursier.core._ +import coursier.lmcoursier._ import coursier.sbtcoursier.Keys._ import coursier.sbtcoursier.Structure._ import sbt.librarymanagement.{Configuration => _, _} diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/RepositoriesTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/RepositoriesTasks.scala index 7b6e375a8..ddf3bfe87 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/RepositoriesTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/RepositoriesTasks.scala @@ -1,5 +1,6 @@ package coursier.sbtcoursier +import coursier.lmcoursier._ import coursier.sbtcoursier.Keys._ import coursier.sbtcoursier.Structure._ import sbt.{Classpaths, Def} diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala index 0c2805989..115d643cb 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala @@ -6,6 +6,7 @@ import coursier.{Cache, ProjectCache} import coursier.core._ import coursier.extra.Typelevel import coursier.ivy.IvyRepository +import coursier.lmcoursier._ import coursier.maven.MavenRepository import coursier.sbtcoursier.Keys._ import sbt.Def diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/UpdateTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/UpdateTasks.scala index 64e85fb54..0a0e38d56 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/UpdateTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/UpdateTasks.scala @@ -1,6 +1,7 @@ package coursier.sbtcoursier import coursier.core._ +import coursier.lmcoursier._ import coursier.sbtcoursier.Keys._ import sbt.Def import sbt.Keys._ diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/helper.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/Helper.scala similarity index 52% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/helper.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/Helper.scala index 5e57a26bc..b567f06bf 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/helper.scala +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/Helper.scala @@ -3,6 +3,6 @@ package coursier object Helper { def checkEmpty(): Boolean = - coursier.sbtcoursier.SbtCoursierCache.default.isEmpty + coursier.lmcoursier.SbtCoursierCache.default.isEmpty -} \ No newline at end of file +}