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

rename to allProjects

This commit is contained in:
Anton Sviridov 2021-04-21 18:50:02 +01:00
parent fea7ceb304
commit 02a630d5ae
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/sbt/internal/ProjectMatrix.scala
View File

@ -121,7 +121,7 @@ sealed trait ProjectMatrix extends CompositeProject {
def filterProjects(axisValues: Seq[VirtualAxis]): Seq[Project]
def filterProjects(autoScalaLibrary: Boolean, axisValues: Seq[VirtualAxis]): Seq[Project]
def finder(axisValues: VirtualAxis*): ProjectFinder
def findAll(): Map[Project, Seq[VirtualAxis]]
def allProjects(): Seq[(Project, Seq[VirtualAxis])]
// resolve to the closest match for the given row
private[sbt] def resolveMatch(thatRow: ProjectMatrix.ProjectRow): ProjectReference
@ -486,10 +486,10 @@ object ProjectMatrix {
override def finder(axisValues: VirtualAxis*): ProjectFinder =
new AxisBaseProjectFinder(axisValues.toSeq)
override def findAll(): Map[Project, Seq[VirtualAxis]] =
override def allProjects(): Seq[(Project, Seq[VirtualAxis])] =
resolvedMappings.map { case(row, project) =>
project -> row.axisValues
}
}.toSeq
def copy(
id: String = id,

4
src/sbt-test/projectMatrix/finder/build.sbt
View File

@ -22,8 +22,8 @@ lazy val custom =
)
check := {
val coreResults: Map[Project, Set[VirtualAxis]] = core.findAll().mapValues(_.toSet)
val customResults: Map[Project, Set[VirtualAxis]] = custom.findAll().mapValues(_.toSet)
val coreResults: Map[Project, Set[VirtualAxis]] = core.allProjects().toMap.mapValues(_.toSet)
val customResults: Map[Project, Set[VirtualAxis]] = custom.allProjects().toMap.mapValues(_.toSet)
val isJvm = VirtualAxis.jvm
val isJs = VirtualAxis.js