Skip to content

Commit ded8a1c

Browse files
committed
Upgrade to Scala 3.0.0-M1
1 parent 435d4be commit ded8a1c

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

build.sbt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ ThisBuild / organizationName := "Typelevel"
99
ThisBuild / publishGithubUser := "mpilquist"
1010
ThisBuild / publishFullName := "Michael Pilquist"
1111

12-
ThisBuild / crossScalaVersions := List("0.27.0-RC1", "2.12.11", "2.13.3")
12+
ThisBuild / crossScalaVersions := List("0.27.0-RC1", "3.0.0-M1", "2.12.11", "2.13.3")
1313

1414
ThisBuild / versionIntroduced := Map(
15-
"0.27.0-RC1" -> "0.1.99" // Disable for now due to bug in sbt-spiewak with RCs
15+
"0.27.0-RC1" -> "0.1.99", // Disable for now due to bug in sbt-spiewak with RCs
16+
"3.0.0-M1" -> "0.1.99" // Disable for now due to bug in sbt-spiewak with RCs
1617
)
1718

1819
ThisBuild / githubWorkflowPublishTargetBranches := Seq(
@@ -74,9 +75,12 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
7475
.settings(dottyJsSettings(ThisBuild / crossScalaVersions))
7576
.settings(
7677
libraryDependencies ++= List(
77-
"org.scalacheck" %% "scalacheck" % "1.15.0"
78+
"org.scalacheck" %%% "scalacheck" % "1.15.0"
7879
)
7980
)
81+
.jsSettings(
82+
crossScalaVersions := crossScalaVersions.value.filter(_.startsWith("2."))
83+
)
8084

8185
lazy val munit = crossProject(JSPlatform, JVMPlatform)
8286
.settings(commonSettings)
@@ -94,3 +98,6 @@ lazy val munit = crossProject(JSPlatform, JVMPlatform)
9498
.settings(
9599
libraryDependencies += "org.scalameta" %%% "munit-scalacheck" % "0.7.16"
96100
)
101+
.jsSettings(
102+
crossScalaVersions := crossScalaVersions.value.filter(_.startsWith("2."))
103+
)

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
22
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
33
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
4-
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.15.2")
5-
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.9.3")
4+
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.17.0")
5+
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.9.4")
66
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.21")

0 commit comments

Comments
 (0)