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

Use Scala's ABI version to generate suffix 

Fixes #37
To support cross building of 3.0.0-M1 and 3.0.0-M2, use the ABI version
to generate the subproject suffix instead of the partial version (first
    two segments)
This commit is contained in:
Eugene Yokota 2020-12-02 00:50:03 -05:00
parent cb72b1e9f1
commit 884440b943
6 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/sbt/VirtualAxis.scala
View File

@ -1,6 +1,6 @@
package sbt
import sbt.librarymanagement.CrossVersion.partialVersion
import sbt.librarymanagement.CrossVersion.{ binaryScalaVersion, partialVersion }
/** Virtual Axis represents a parameter to a project matrix row. */
sealed abstract class VirtualAxis {
@ -106,6 +106,9 @@ object VirtualAxis {
case Some((m, n)) => scalaVersionAxis(scalaVersion, s"$m.$n")
case _ => scalaVersionAxis(scalaVersion, scalaVersion)
}
def scalaABIVersion(scalaVersion: String): ScalaVersionAxis =
scalaVersionAxis(scalaVersion, binaryScalaVersion(scalaVersion))
def scalaVersionAxis(scalaVersion: String, value: String) =
ScalaVersionAxis(scalaVersion, value)

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

@ -434,7 +434,7 @@ object ProjectMatrix {
private final class AxisBaseProjectFinder(axisValues: Seq[VirtualAxis]) extends ProjectFinder {
def get: Seq[Project] = filterProjects(axisValues)
def apply(sv: String): Project =
filterProjects(true, axisValues ++ Seq(VirtualAxis.scalaPartialVersion(sv))).headOption
filterProjects(true, axisValues ++ Seq(VirtualAxis.scalaABIVersion(sv))).headOption
.getOrElse(sys.error(s"project matching $axisValues and $sv was not found"))
def apply(autoScalaLibrary: Boolean): Project =
filterProjects(autoScalaLibrary, axisValues).headOption
@ -467,7 +467,7 @@ object ProjectMatrix {
): ProjectMatrix =
if (autoScalaLibrary) {
scalaVersions.foldLeft(this: ProjectMatrix) { (acc, sv) =>
acc.customRow(autoScalaLibrary, axisValues ++ Seq(VirtualAxis.scalaPartialVersion(sv)), process)
acc.customRow(autoScalaLibrary, axisValues ++ Seq(VirtualAxis.scalaABIVersion(sv)), process)
}
} else {
customRow(autoScalaLibrary, Seq(VirtualAxis.jvm), process)
@ -518,7 +518,7 @@ object ProjectMatrix {
// called by macro
def apply(id: String, base: sbt.File): ProjectMatrix = {
val defaultDefAxes = Seq(VirtualAxis.jvm, VirtualAxis.scalaPartialVersion("2.13.3"))
val defaultDefAxes = Seq(VirtualAxis.jvm, VirtualAxis.scalaABIVersion("2.13.3"))
val matrix = unresolved(id, base, Nil, Nil, Nil, Nil, Nil, Nil, Plugins.Empty, Nil, defaultDefAxes)
allMatrices(id) = matrix
matrix

11
src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/build.sbt
View File

@ -1,5 +1,6 @@
lazy val check = taskKey[Unit]("")
lazy val scala3 = "3.0.0-M1"
lazy val scala3M1 = "3.0.0-M1"
lazy val scala3M2 = "3.0.0-M2"
lazy val scala213 = "2.13.4"
lazy val fooApp = (projectMatrix in file("foo-app"))
@ -7,9 +8,9 @@ lazy val fooApp = (projectMatrix in file("foo-app"))
.settings(
name := "foo app",
)
.jvmPlatform(scalaVersions = Seq(scala3))
.jvmPlatform(scalaVersions = Seq(scala3M1, scala3M2))
lazy val fooApp3 = fooApp.jvm(scala3)
lazy val fooApp3 = fooApp.jvm(scala3M1)
.settings(
test := { () },
)
@ -31,7 +32,7 @@ lazy val barCore = (projectMatrix in file("bar-core"))
.settings(
name := "bar core",
)
.jvmPlatform(scalaVersions = Seq(scala3))
.jvmPlatform(scalaVersions = Seq(scala3M2))
// choose 2.13 when bazCore offers both 2.13 and Dotty
lazy val bazApp = (projectMatrix in file("baz-app"))
@ -53,4 +54,4 @@ lazy val bazCore = (projectMatrix in file("baz-core"))
name := "baz core",
exportJars := true,
)
.jvmPlatform(scalaVersions = Seq(scala213, scala3))
.jvmPlatform(scalaVersions = Seq(scala213, scala3M1))

4
src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/test
View File

@ -1,4 +1,6 @@
> fooApp3_0/compile
> projects
> fooApp3_0_0_M1/compile
> barApp/compile

9
src/sbt-test/projectMatrix/jvm-sandwich/build.sbt
View File

@ -1,5 +1,6 @@
lazy val check = taskKey[Unit]("")
lazy val scala3 = "3.0.0-M1"
lazy val scala3M1 = "3.0.0-M1"
lazy val scala3M2 = "3.0.0-M2"
lazy val scala213 = "2.13.4"
lazy val fooApp = (projectMatrix in file("foo-app"))
@ -7,7 +8,7 @@ lazy val fooApp = (projectMatrix in file("foo-app"))
.settings(
name := "foo app",
)
.jvmPlatform(scalaVersions = Seq(scala3))
.jvmPlatform(scalaVersions = Seq(scala3M1, scala3M2))
lazy val fooCore = (projectMatrix in file("foo-core"))
.settings(
@ -26,7 +27,7 @@ lazy val barCore = (projectMatrix in file("bar-core"))
.settings(
name := "bar core",
)
.jvmPlatform(scalaVersions = Seq(scala3))
.jvmPlatform(scalaVersions = Seq(scala3M1))
// choose 2.13 when bazCore offers both 2.13 and Dotty
lazy val bazApp = (projectMatrix in file("baz-app"))
@ -49,4 +50,4 @@ lazy val bazCore = (projectMatrix in file("baz-core"))
name := "baz core",
exportJars := true,
)
.jvmPlatform(scalaVersions = Seq(scala213, scala3))
.jvmPlatform(scalaVersions = Seq(scala213, scala3M1, scala3M2))

4
src/sbt-test/projectMatrix/jvm-sandwich/test
View File

@ -1,4 +1,6 @@
> fooApp3_0/compile
> projects
> fooApp3_0_0_M1/compile
> barApp/compile