Skip to content

Commit b6a938e

Browse files
committed
bump scala3 and scala-native
I forced to make this changes by single commit because it requires to switch to the next version of scalatests.
1 parent 620ba4f commit b6a938e

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
All notable changes to this project will be documented in this file.
44

55
## [unreleased]
6-
- Switch to Scala.js-1.5.0.
6+
- Switched to Scala.js-1.5.0.
7+
- Switched to Scala-Native-0.4.0.
8+
- Switched to Scala3-3.0.0-RC1.
79

810
## [2.3.0] - 2021-01-06
911
- Introduced `newDeriveKeyHasher(Hasher => Unit)`.

build.sbt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import sbt.Keys.crossScalaVersions
22
import sbtcrossproject.CrossPlugin.autoImport.crossProject
33

44
lazy val scala211 = "2.11.12"
5-
lazy val scala212 = "2.12.12"
5+
lazy val scala212 = "2.12.13"
66
lazy val scala213 = "2.13.4"
7-
lazy val scala3 = "3.0.0-M3"
7+
lazy val scala3 = "3.0.0-RC1"
88

9-
lazy val scalatestVersion = "3.2.3"
9+
lazy val scalatestVersion = "3.2.4"
1010

1111
lazy val blake3jniVersion = "0.2.2"
1212

@@ -53,12 +53,13 @@ lazy val blake3 = crossProject(JSPlatform, JVMPlatform, NativePlatform)
5353
)
5454
.jsSettings(
5555
scalaVersion := scala213,
56+
// scalatests doesn't support scala3 for scala.js yet
5657
crossScalaVersions := Seq(scala211, scala212, scala213),
5758
)
5859
.nativeSettings(
59-
scalaVersion := scala211,
60-
crossScalaVersions := Seq(scala211),
61-
nativeLinkStubs := true
60+
scalaVersion := scala213,
61+
crossScalaVersions := Seq(scala211, scala212, scala213),
62+
nativeLinkStubs := true,
6263
)
6364

6465
lazy val bench = project.in(file("bench"))

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
44
val scalaJSVersion =
55
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.5.0")
66
val scalaNativeJSVersion =
7-
Option(System.getenv("SCALANATIVE_VERSION")).getOrElse("0.4.0-M2")
7+
Option(System.getenv("SCALANATIVE_VERSION")).getOrElse("0.4.0")
88

99
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
1010
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeJSVersion)
11-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.1")
11+
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3")
1212

1313
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.0")
1414
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1")

0 commit comments

Comments
 (0)