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

Merge pull request #7689 from eed3si9n/wip/matrix_followup 

[2.x] Make Scala 3 the default axis of the projectMatrix, not 2.13
This commit is contained in:
eugene yokota 2024-09-22 13:18:57 -04:00 committed by GitHub
parent 7d1868ec64 4ff0477e1e
commit d7185c9c52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -701,7 +701,7 @@ object ProjectMatrix {
// called by macro // called by macro
def apply(id: String, base: File): ProjectMatrix = { def apply(id: String, base: File): ProjectMatrix = {
val defaultDefAxes = Seq(VirtualAxis.jvm, VirtualAxis.scalaABIVersion("2.13.3")) val defaultDefAxes = Seq(VirtualAxis.jvm, VirtualAxis.scalaABIVersion("3.3.3"))
val matrix = unresolved( val matrix = unresolved(
id, id,
base, base,

4
sbt-app/src/sbt-test/project-matrix/jvm-sandwich/test
View File

@ -2,6 +2,6 @@
> fooApp3_0_0_M1/compile > fooApp3_0_0_M1/compile
> barApp/compile > barApp2_13/compile
> bazApp/check > bazApp2_13/check

2
sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/test
View File

@ -3,4 +3,4 @@
$ exists target/out/jvm/scala-2.13.3/core/backend/a/Core.class $ exists target/out/jvm/scala-2.13.3/core/backend/a/Core.class
$ exists target/out/jvm/scala-2.12.12/core/backend/a/Core.class $ exists target/out/jvm/scala-2.12.12/core/backend/a/Core.class
> core/check > core2_13/check

6
sbt-app/src/sbt-test/project-matrix/jvm/build.sbt
View File

@ -1,5 +1,5 @@
lazy val scala213 = "2.13.3" lazy val scala213 = "2.13.3"
lazy val scala212 = "2.12.12" lazy val scala3 = "3.4.2"
lazy val check = taskKey[Unit]("") lazy val check = taskKey[Unit]("")
lazy val root = (project in file(".")) lazy val root = (project in file("."))
@ -13,7 +13,7 @@ lazy val app = (projectMatrix in file("app"))
.settings( .settings(
name := "app" name := "app"
) )
.jvmPlatform(scalaVersions = Seq(scala213)) .jvmPlatform(scalaVersions = Seq(scala3))
lazy val core = (projectMatrix in file("core")) lazy val core = (projectMatrix in file("core"))
.settings( .settings(
@ -22,7 +22,7 @@ lazy val core = (projectMatrix in file("core"))
assert(projectMatrixBaseDirectory.value == file("core")) assert(projectMatrixBaseDirectory.value == file("core"))
}, },
) )
.jvmPlatform(scalaVersions = Seq(scala213, scala212)) .jvmPlatform(scalaVersions = Seq(scala213, scala3))
lazy val intf = (projectMatrix in file("intf")) lazy val intf = (projectMatrix in file("intf"))
.settings( .settings(

2
sbt-app/src/sbt-test/project-matrix/jvm/test
View File

@ -1,6 +1,6 @@
> compile > compile
$ exists target/out/jvm/scala-2.13.3/core/backend/a/Core.class $ exists target/out/jvm/scala-2.13.3/core/backend/a/Core.class
$ exists target/out/jvm/scala-2.12.12/core/backend/a/Core.class $ exists target/out/jvm/scala-3.4.2/core/backend/a/Core.class
> core/check > core/check

2
sbt-app/src/sbt-test/project-matrix/lib/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / version := "0.1.0-SNAPSHOT" version := "0.1.0-SNAPSHOT"
lazy val util = projectMatrix lazy val util = projectMatrix
.jvmPlatform(scalaVersions = Seq("2.12.19", "2.13.13")) .jvmPlatform(scalaVersions = Seq("2.12.19", "2.13.13"))

2
sbt-app/src/sbt-test/project-matrix/lib/test
View File

@ -12,4 +12,4 @@ $ copy-file target/out/jvm/scala-2.12.19/strayjar/strayjar_2.12-0.1.0-SNAPSHOT.j
# check ss # check ss
$ mkdir ss/lib $ mkdir ss/lib
$ copy-file target/out/jvm/scala-2.12.19/strayjar/strayjar_2.12-0.1.0-SNAPSHOT.jar ss/lib/strayJar.jar $ copy-file target/out/jvm/scala-2.12.19/strayjar/strayjar_2.12-0.1.0-SNAPSHOT.jar ss/lib/strayJar.jar
> ss/compile > ss2_13/compile