Adjust namespace

This commit is contained in:
Alexandre Archambault 2018-11-20 10:53:40 +01:00
parent 55f457a6f7
commit df7e529a59
33 changed files with 43 additions and 36 deletions

View File

@ -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 + ")"

View File

@ -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)

View File

@ -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": [

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
import java.io.File

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
import java.io.File
import java.util.concurrent.ExecutorService

View File

@ -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

View File

@ -1,5 +1,6 @@
package sbt.librarymanagement
package coursier
package coursier.lmcoursier
import sbt.librarymanagement.LibraryManagementCodec
trait CoursierLibraryManagementCodec
extends sjsonnew.BasicJsonProtocol

View File

@ -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)
}
}

View File

@ -1,4 +1,4 @@
package sbt.librarymanagement.coursier
package coursier.lmcoursier
import sbt.librarymanagement.ModuleSettings

View File

@ -1,4 +1,4 @@
package sbt.librarymanagement.coursier
package coursier.lmcoursier
import sbt.librarymanagement.Resolver
import sjsonnew.JsonFormat

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
import coursier.ivy.IvyRepository
import coursier.ivy.IvyXml.{mappings => ivyXmlMappings}

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
import coursier.core.{Configuration, ModuleName, Organization, Project}
import sbt.librarymanagement.{InclExclRule, ModuleID}

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
import coursier.Fetch
import coursier.core._

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
object Lock {

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
import coursier.FileError
import coursier.core.Module

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
final class ResolutionException(
val error: ResolutionError

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
import java.io.File
import java.net.URL

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
import java.util.concurrent.ExecutorService

View File

@ -1,4 +1,4 @@
package sbt.librarymanagement.coursier
package coursier.lmcoursier
import sbt.librarymanagement.{ MavenRepository, Resolver, URLRepository }

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
import java.io.File

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
import java.util.concurrent.ConcurrentHashMap

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
import java.io.File
import java.net.URL

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
import java.io.File

View File

@ -1,4 +1,4 @@
package coursier.sbtcoursier
package coursier.lmcoursier
import java.io.File

View File

@ -1,4 +1,4 @@
package sbt.librarymanagement.coursier
package coursier.lmcoursier
import org.scalatest.{Matchers, PropSpec}
import sbt.internal.librarymanagement.cross.CrossVersionUtil

View File

@ -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 => _, _}

View File

@ -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._

View File

@ -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}

View File

@ -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 => _, _}

View File

@ -1,5 +1,6 @@
package coursier.sbtcoursier
import coursier.lmcoursier._
import coursier.sbtcoursier.Keys._
import coursier.sbtcoursier.Structure._
import sbt.{Classpaths, Def}

View File

@ -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

View File

@ -1,6 +1,7 @@
package coursier.sbtcoursier
import coursier.core._
import coursier.lmcoursier._
import coursier.sbtcoursier.Keys._
import sbt.Def
import sbt.Keys._

View File

@ -3,6 +3,6 @@ package coursier
object Helper {
def checkEmpty(): Boolean =
coursier.sbtcoursier.SbtCoursierCache.default.isEmpty
coursier.lmcoursier.SbtCoursierCache.default.isEmpty
}
}