From 33de2221f790e47a5cef4a16b88ca98093b3e377 Mon Sep 17 00:00:00 2001 From: andrea Date: Wed, 24 Oct 2018 12:18:16 +0100 Subject: [PATCH] fixing tests --- .../coursier/CoursierConfiguration.scala | 22 ++++++++----------- .../CoursierConfigurationFormats.scala | 4 +--- .../CoursierDependencyResolution.scala | 3 ++- .../coursier/ResolutionSpec.scala | 6 ++--- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala b/coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala index a892e1c75..1864c4440 100644 --- a/coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala +++ b/coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala @@ -10,23 +10,22 @@ final class CoursierConfiguration private ( val otherResolvers: Vector[sbt.librarymanagement.Resolver], val reorderResolvers: Boolean, val parallelDownloads: Int, - val maxIterations: Int, - val ignoreArtifactErrors: Boolean) extends Serializable { + val maxIterations: Int) 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 { - 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 } 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 = { - "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 = { - new CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations, ignoreArtifactErrors) + 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) } def withLog(log: Option[xsbti.Logger]): CoursierConfiguration = { copy(log = log) @@ -49,13 +48,10 @@ final class CoursierConfiguration private ( def withMaxIterations(maxIterations: Int): CoursierConfiguration = { copy(maxIterations = maxIterations) } - def withIgnoreArtifactErrors(ignoreArtifactErrors: Boolean): CoursierConfiguration = { - copy(ignoreArtifactErrors = ignoreArtifactErrors) - } } object 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: 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: 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): CoursierConfiguration = new CoursierConfiguration(Option(log), resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations) } diff --git a/coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala b/coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala index a2cba5218..ff8713f87 100644 --- a/coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala +++ b/coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala @@ -17,9 +17,8 @@ implicit lazy val CoursierConfigurationFormat: JsonFormat[sbt.librarymanagement. val reorderResolvers = unbuilder.readField[Boolean]("reorderResolvers") val parallelDownloads = unbuilder.readField[Int]("parallelDownloads") val maxIterations = unbuilder.readField[Int]("maxIterations") - val ignoreArtifactErrors = unbuilder.readField[Boolean]("ignoreArtifactErrors") 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 => deserializationError("Expected JsObject but found None") } @@ -32,7 +31,6 @@ implicit lazy val CoursierConfigurationFormat: JsonFormat[sbt.librarymanagement. builder.addField("reorderResolvers", obj.reorderResolvers) builder.addField("parallelDownloads", obj.parallelDownloads) builder.addField("maxIterations", obj.maxIterations) - builder.addField("ignoreArtifactErrors", obj.ignoreArtifactErrors) builder.endObject() } } diff --git a/coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala b/coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala index 527ab4b8e..04ec6e49c 100644 --- a/coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala +++ b/coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala @@ -274,7 +274,8 @@ private[sbt] class CoursierDependencyResolution(coursierConfiguration: CoursierC val depsByConfig = { val deps = resolution.dependencies.toVector - configurations.map((_, deps)).toMap + (configurations ++ + Seq(ScalaTool, CompilerPlugin, Component).map(_.name)).map((_, deps)).toMap } val configurations0 = extractConfigurationTree diff --git a/coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala b/coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala index 80fa40f24..dce781136 100644 --- a/coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala +++ b/coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala @@ -36,13 +36,13 @@ class ResolutionSpec extends BaseCoursierSpecification { r.configurations.map(_.configuration) should have size 11 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 - runtimeConfig.modules should have size 1 + runtimeConfig.modules should have size 2 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 {