Give a more precise type to mkIvyConfiguration

This makes it possible to do mkIvyConfiguration.value.withXXX(...) for
all the methods in InlineIvyConfiguration. (I need this to remove
inter-project resolvers when fetching dotty from sbt-dotty to avoid
accidentally fetching a local project in the build of dotty itself).
This commit is contained in:
Guillaume Martres 2019-12-05 17:45:33 +01:00
parent 47985e33ae
commit 437950266f
2 changed files with 6 additions and 1 deletions

View File

@ -800,6 +800,11 @@ lazy val mainProj = (project in file("main"))
exclude[IncompatibleSignatureProblem]("sbt.ProjectExtra.inScope"),
exclude[MissingTypesProblem]("sbt.internal.Load*"),
exclude[IncompatibleSignatureProblem]("sbt.internal.Load*"),
// IvyConfiguration was replaced by InlineIvyConfiguration in the generic
// signature, this does not break compatibility regardless of what
// cast a compiler might have inserted based on the old signature
// since we're returning the same values as before.
exclude[IncompatibleSignatureProblem]("sbt.Classpaths.mkIvyConfiguration")
)
)
.configure(

View File

@ -3252,7 +3252,7 @@ object Classpaths {
buildDependencies.value
)
}
def mkIvyConfiguration: Initialize[Task[IvyConfiguration]] =
def mkIvyConfiguration: Initialize[Task[InlineIvyConfiguration]] =
Def.task {
val (rs, other) = (fullResolvers.value.toVector, otherResolvers.value.toVector)
val s = streams.value