preferScala2: only for projects that are fully cross-compiled, #SCL-2…

…2619
JetBrains · Jan 22, 2025 · ef006aa · ef006aa
1 parent 06a3a86
commit ef006aa
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/extractor/src/main/scala/org/jetbrains/sbt/extractors/UtilityTasks.scala b/extractor/src/main/scala/org/jetbrains/sbt/extractors/UtilityTasks.scala
@@ -33,14 +33,15 @@ object UtilityTasks extends SbtStateOps {
       (extracted.structure, extracted.structure.data)
     }
 
-    val crossScala2VersionsInScala3Projects = structure.allProjectRefs.flatMap { project =>
-      Keys.scalaVersion.in(project).get(data)
-        .filter(_.startsWith("3."))
-        .map(_ => Keys.crossScalaVersions.in(project).get(data).getOrElse(Seq.empty).filter(_.startsWith("2.")))
-        .getOrElse(Seq.empty)
+    val scala3Projects = structure.allProjectRefs.filter { project =>
+      Keys.scalaVersion.in(project).get(data).exists(_.startsWith("3."))
     }
 
-    if (crossScala2VersionsInScala3Projects.nonEmpty) {
+    val crossScala2VersionsInScala3Projects = scala3Projects.flatMap { project =>
+      Keys.crossScalaVersions.in(project).get(data).getOrElse(Seq.empty).filter(_.startsWith("2."))
+    }
+
+    if (crossScala2VersionsInScala3Projects.nonEmpty && scala3Projects.length == crossScala2VersionsInScala3Projects.length) {
       "++" + crossScala2VersionsInScala3Projects.maxBy(numbersOf) :: state
     } else {
       state