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

Merge pull request #5271 from smarter/mkIvyConfiguration-precise-type 

Give a more precise type to mkIvyConfiguration
This commit is contained in:
eugene yokota 2019-12-05 14:32:46 -05:00 committed by GitHub
parent 47985e33ae 437950266f
commit 4adb56ae9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.sbt
View File

@ -800,6 +800,11 @@ lazy val mainProj = (project in file("main"))
exclude[IncompatibleSignatureProblem]("sbt.ProjectExtra.inScope"), exclude[IncompatibleSignatureProblem]("sbt.ProjectExtra.inScope"),
exclude[MissingTypesProblem]("sbt.internal.Load*"), exclude[MissingTypesProblem]("sbt.internal.Load*"),
exclude[IncompatibleSignatureProblem]("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( .configure(

2
main/src/main/scala/sbt/Defaults.scala
View File

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