Skip to content

Commit 1652da3

Browse files
authored
Merge pull request #406 from cquiroz/scala-updates
Update scala versions
2 parents 561ded1 + d3c934d commit 1652da3

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

.github/workflows/scala.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
scala: [ '2.11.12', '2.12.15', '2.13.8', '3.1.3' ]
30+
scala: [ '2.11.12', '2.12.17', '2.13.10', '3.2.1' ]
3131
platform: [ 'JVM', 'JS', 'Native' ]
3232
steps:
3333
- name: Checkout current branch

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
247247
publish / skip := true,
248248
Keys.`package` := file(""),
249249
libraryDependencies +=
250-
"org.scalatest" %%% "scalatest" % "3.2.13" % Test,
250+
"org.scalatest" %%% "scalatest" % "3.2.14" % Test,
251251
scalacOptions ~= (_.filterNot(
252252
Set("-Wnumeric-widen", "-Ywarn-numeric-widen", "-Ywarn-value-discard", "-Wvalue-discard")
253253
))

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.7.0
1+
sbt.version=1.7.3

project/plugins.sbt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.10.1")
2+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.11.0")
33

44
addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "1.2.0")
55

@@ -13,12 +13,15 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
1313

1414
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.3.1")
1515

16-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
16+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
1717

1818
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")
1919

2020
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
2121

22-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5")
22+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.8")
2323

24-
libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.3"
24+
libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.5"
25+
libraryDependencySchemes ++= Seq(
26+
"org.scala-native" % "sbt-scala-native" % VersionScheme.Always
27+
)

0 commit comments

Comments
 (0)