luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing tests

This commit is contained in:
andrea 2018-10-24 12:18:16 +01:00
parent 2e6870d17e
commit 33de2221f7
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala
View File

@ -10,23 +10,22 @@ final class CoursierConfiguration private (
val otherResolvers: Vector[sbt.librarymanagement.Resolver], val otherResolvers: Vector[sbt.librarymanagement.Resolver],
val reorderResolvers: Boolean, val reorderResolvers: Boolean,
val parallelDownloads: Int, val parallelDownloads: Int,
val maxIterations: Int, val maxIterations: Int) extends Serializable {
val ignoreArtifactErrors: Boolean) extends Serializable {
private def this() = this(None, sbt.librarymanagement.Resolver.defaults, Vector.empty, true, 6, 100, false) private def this() = this(None, sbt.librarymanagement.Resolver.defaults, Vector.empty, true, 6, 100)
override def equals(o: Any): Boolean = o match { override def equals(o: Any): Boolean = o match {
case x: CoursierConfiguration => (this.log == x.log) && (this.resolvers == x.resolvers) && (this.otherResolvers == x.otherResolvers) && (this.reorderResolvers == x.reorderResolvers) && (this.parallelDownloads == x.parallelDownloads) && (this.maxIterations == x.maxIterations) && (this.ignoreArtifactErrors == x.ignoreArtifactErrors) case x: CoursierConfiguration => (this.log == x.log) && (this.resolvers == x.resolvers) && (this.otherResolvers == x.otherResolvers) && (this.reorderResolvers == x.reorderResolvers) && (this.parallelDownloads == x.parallelDownloads) && (this.maxIterations == x.maxIterations)
case _ => false case _ => false
} }
override def hashCode: Int = { override def hashCode: Int = {
37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "sbt.librarymanagement.coursier.CoursierConfiguration".##) + log.##) + resolvers.##) + otherResolvers.##) + reorderResolvers.##) + parallelDownloads.##) + maxIterations.##) + ignoreArtifactErrors.##) 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "sbt.librarymanagement.coursier.CoursierConfiguration".##) + log.##) + resolvers.##) + otherResolvers.##) + reorderResolvers.##) + parallelDownloads.##) + maxIterations.##)
} }
override def toString: String = { override def toString: String = {
"CoursierConfiguration(" + log + ", " + resolvers + ", " + otherResolvers + ", " + reorderResolvers + ", " + parallelDownloads + ", " + maxIterations + ", " + ignoreArtifactErrors + ")" "CoursierConfiguration(" + log + ", " + resolvers + ", " + otherResolvers + ", " + reorderResolvers + ", " + parallelDownloads + ", " + maxIterations + ")"
} }
private[this] def copy(log: Option[xsbti.Logger] = log, resolvers: Vector[sbt.librarymanagement.Resolver] = resolvers, otherResolvers: Vector[sbt.librarymanagement.Resolver] = otherResolvers, reorderResolvers: Boolean = reorderResolvers, parallelDownloads: Int = parallelDownloads, maxIterations: Int = maxIterations, ignoreArtifactErrors: Boolean = ignoreArtifactErrors): CoursierConfiguration = { private[this] def copy(log: Option[xsbti.Logger] = log, resolvers: Vector[sbt.librarymanagement.Resolver] = resolvers, otherResolvers: Vector[sbt.librarymanagement.Resolver] = otherResolvers, reorderResolvers: Boolean = reorderResolvers, parallelDownloads: Int = parallelDownloads, maxIterations: Int = maxIterations): CoursierConfiguration = {
new CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations, ignoreArtifactErrors) new CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations)
} }
def withLog(log: Option[xsbti.Logger]): CoursierConfiguration = { def withLog(log: Option[xsbti.Logger]): CoursierConfiguration = {
copy(log = log) copy(log = log)
@ -49,13 +48,10 @@ final class CoursierConfiguration private (
def withMaxIterations(maxIterations: Int): CoursierConfiguration = { def withMaxIterations(maxIterations: Int): CoursierConfiguration = {
copy(maxIterations = maxIterations) copy(maxIterations = maxIterations)
} }
def withIgnoreArtifactErrors(ignoreArtifactErrors: Boolean): CoursierConfiguration = {
copy(ignoreArtifactErrors = ignoreArtifactErrors)
}
} }
object CoursierConfiguration { object CoursierConfiguration {
def apply(): CoursierConfiguration = new CoursierConfiguration() def apply(): CoursierConfiguration = new CoursierConfiguration()
def apply(log: Option[xsbti.Logger], resolvers: Vector[sbt.librarymanagement.Resolver], otherResolvers: Vector[sbt.librarymanagement.Resolver], reorderResolvers: Boolean, parallelDownloads: Int, maxIterations: Int, ignoreArtifactErrors: Boolean): CoursierConfiguration = new CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations, ignoreArtifactErrors) def apply(log: Option[xsbti.Logger], resolvers: Vector[sbt.librarymanagement.Resolver], otherResolvers: Vector[sbt.librarymanagement.Resolver], reorderResolvers: Boolean, parallelDownloads: Int, maxIterations: Int): CoursierConfiguration = new CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations)
def apply(log: xsbti.Logger, resolvers: Vector[sbt.librarymanagement.Resolver], otherResolvers: Vector[sbt.librarymanagement.Resolver], reorderResolvers: Boolean, parallelDownloads: Int, maxIterations: Int, ignoreArtifactErrors: Boolean): CoursierConfiguration = new CoursierConfiguration(Option(log), resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations, ignoreArtifactErrors) def apply(log: xsbti.Logger, resolvers: Vector[sbt.librarymanagement.Resolver], otherResolvers: Vector[sbt.librarymanagement.Resolver], reorderResolvers: Boolean, parallelDownloads: Int, maxIterations: Int): CoursierConfiguration = new CoursierConfiguration(Option(log), resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations)
} }

4
coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala
View File

@ -17,9 +17,8 @@ implicit lazy val CoursierConfigurationFormat: JsonFormat[sbt.librarymanagement.
val reorderResolvers = unbuilder.readField[Boolean]("reorderResolvers") val reorderResolvers = unbuilder.readField[Boolean]("reorderResolvers")
val parallelDownloads = unbuilder.readField[Int]("parallelDownloads") val parallelDownloads = unbuilder.readField[Int]("parallelDownloads")
val maxIterations = unbuilder.readField[Int]("maxIterations") val maxIterations = unbuilder.readField[Int]("maxIterations")
val ignoreArtifactErrors = unbuilder.readField[Boolean]("ignoreArtifactErrors")
unbuilder.endObject() unbuilder.endObject()
sbt.librarymanagement.coursier.CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations, ignoreArtifactErrors) sbt.librarymanagement.coursier.CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations)
case None => case None =>
deserializationError("Expected JsObject but found None") deserializationError("Expected JsObject but found None")
} }
@ -32,7 +31,6 @@ implicit lazy val CoursierConfigurationFormat: JsonFormat[sbt.librarymanagement.
builder.addField("reorderResolvers", obj.reorderResolvers) builder.addField("reorderResolvers", obj.reorderResolvers)
builder.addField("parallelDownloads", obj.parallelDownloads) builder.addField("parallelDownloads", obj.parallelDownloads)
builder.addField("maxIterations", obj.maxIterations) builder.addField("maxIterations", obj.maxIterations)
builder.addField("ignoreArtifactErrors", obj.ignoreArtifactErrors)
builder.endObject() builder.endObject()
} }
} }

3
coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala
View File

@ -274,7 +274,8 @@ private[sbt] class CoursierDependencyResolution(coursierConfiguration: CoursierC
val depsByConfig = { val depsByConfig = {
val deps = resolution.dependencies.toVector val deps = resolution.dependencies.toVector
configurations.map((_, deps)).toMap (configurations ++
Seq(ScalaTool, CompilerPlugin, Component).map(_.name)).map((_, deps)).toMap
} }
val configurations0 = extractConfigurationTree val configurations0 = extractConfigurationTree

6
coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala
View File

@ -36,13 +36,13 @@ class ResolutionSpec extends BaseCoursierSpecification {
r.configurations.map(_.configuration) should have size 11 r.configurations.map(_.configuration) should have size 11
val compileConfig = r.configurations.find(_.configuration == Compile.toConfigRef).get val compileConfig = r.configurations.find(_.configuration == Compile.toConfigRef).get
compileConfig.modules should have size 1 compileConfig.modules should have size 2
val runtimeConfig = r.configurations.find(_.configuration == Runtime.toConfigRef).get val runtimeConfig = r.configurations.find(_.configuration == Runtime.toConfigRef).get
runtimeConfig.modules should have size 1 runtimeConfig.modules should have size 2
val testConfig = r.configurations.find(_.configuration == Test.toConfigRef).get val testConfig = r.configurations.find(_.configuration == Test.toConfigRef).get
testConfig.modules should have size 1 testConfig.modules should have size 2
} }
it should "resolve compiler bridge" in { it should "resolve compiler bridge" in {