Skip to content

Commit b70868d

Browse files
authored
Update scala3 to 3.1.2 and scalatest to 3.2.12 (#75)
Closes: #71 Closes: #74
1 parent 9419dbc commit b70868d

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

Diff for: CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
All notable changes to this project will be documented in this file.
44

55
## [unreleased]
6+
- Switched to scala-3.1.2
67

78
## [3.0.0] - 2021-12-23
89
- Migrated to package `pt.kcry.blake3`

Diff for: build.sbt

+5-15
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ lazy val scala210 = "2.10.7"
55
lazy val scala211 = "2.11.12"
66
lazy val scala212 = "2.12.15"
77
lazy val scala213 = "2.13.8"
8-
lazy val scala30 = "3.0.2"
98
lazy val scala31 = "3.1.1"
109

1110
lazy val scalatestVersion = "3.2.10"
@@ -17,7 +16,7 @@ ThisBuild / organization := "pt.kcry"
1716

1817
ThisBuild / dynverSeparator := "-"
1918

20-
ThisBuild / scalaVersion := scala213
19+
ThisBuild / scalaVersion := scala31
2120
ThisBuild / crossScalaVersions := Seq()
2221

2322
ThisBuild / scalacOptions ++= Seq("-target:jvm-1.8", "-unchecked",
@@ -30,12 +29,6 @@ headerLicense := LicenseDefinition.template
3029
lazy val blake3 = crossProject(JSPlatform, JVMPlatform, NativePlatform)
3130
.crossType(CrossType.Full).enablePlugins(BuildInfoPlugin)
3231
.enablePlugins(AutomateHeaderPlugin).in(file(".")).settings(
33-
// Don't publish for Scala 3.1 or later, only from 3.0
34-
publish / skip :=
35-
(CrossVersion.partialVersion(scalaVersion.value) match {
36-
case Some((3, x)) if x > 0 => true
37-
case _ => false
38-
}),
3932
Test / publishArtifact := false,
4033
buildInfoKeys := Seq(BuildInfoKey.action("commit") {
4134
scala.sys.process.Process("git rev-parse HEAD").!!.trim
@@ -44,13 +37,10 @@ lazy val blake3 = crossProject(JSPlatform, JVMPlatform, NativePlatform)
4437
buildInfoPackage := "pt.kcry.blake3",
4538
libraryDependencies ++=
4639
Seq("org.scalatest" %%% "scalatest" % scalatestVersion % Test)
47-
).jvmSettings(scalaVersion := scala213,
48-
crossScalaVersions := Seq(scala210, scala211, scala212, scala213, scala30,
49-
scala31)
50-
).jsSettings(scalaVersion := scala213,
51-
crossScalaVersions := Seq(scala211, scala212, scala213, scala30, scala31))
52-
.nativeSettings(scalaVersion := scala213,
53-
crossScalaVersions := Seq(scala211, scala212, scala213),
40+
).jvmSettings(
41+
crossScalaVersions := Seq(scala210, scala211, scala212, scala213, scala31)
42+
).jsSettings(crossScalaVersions := Seq(scala211, scala212, scala213, scala31))
43+
.nativeSettings(crossScalaVersions := Seq(scala211, scala212, scala213),
5444
nativeLinkStubs := true)
5545

5646
lazy val bench = project.in(file("bench")).dependsOn(blake3.jvm)

Diff for: project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
33

44
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.10.0")
55
val scalaNativeJSVersion = Option(System.getenv("SCALANATIVE_VERSION"))
6-
.getOrElse("0.4.2")
6+
.getOrElse("0.4.4")
77

88
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
99
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeJSVersion)

0 commit comments

Comments
 (0)