Skip to content

Fix regression in #SCL-22619 avoid double-counting projects with multiple Scala 2 cross versions #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix regression in #SCL-22619 avoid double-counting projects with multiple Scala 2 cross versions #73

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions extractor/src/main/scala/org/jetbrains/sbt/extractors/UtilityTasks.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,18 @@ object UtilityTasks extends SbtStateOps {
(project / Keys.scalaVersion).get(data).exists(_.startsWith("3."))
}

val crossScala2VersionsInScala3Projects = scala3Projects.flatMap { project =>
(project / Keys.crossScalaVersions).get(data).getOrElse(Seq.empty).filter(_.startsWith("2."))
val (scala2Versions, crossScala2And3ProjectsCount) = scala3Projects.foldLeft((Set.empty[String], 0)) {
case ((scala2Versions, crossCount), project) =>
val projectScala2Versions = (project / Keys.crossScalaVersions).get(data).getOrElse(Seq.empty).filter(_.startsWith("2."))
(scala2Versions ++ projectScala2Versions, crossCount + (if (projectScala2Versions.nonEmpty) 1 else 0))
}

// We can only do this when all sbt projects cross-compile to Scala 2 & Scala 3
// See https://youtrack.jetbrains.com/issue/SCL-22619/
val canSetScala2VersionGlobally = crossScala2VersionsInScala3Projects.nonEmpty &&
scala3Projects.length == crossScala2VersionsInScala3Projects.length
val canSetScala2VersionGlobally = crossScala2And3ProjectsCount > 0 &&
scala3Projects.length == crossScala2And3ProjectsCount
if (canSetScala2VersionGlobally) {
"++" + crossScala2VersionsInScala3Projects.maxBy(numbersOf) :: state
"++" + scala2Versions.maxBy(numbersOf) :: state
} else {
state
}
Expand Down