Skip to content

Commit b736c66

Browse files
authored
Merge pull request #723 from scala-js/issue/706
Update to Scala.js 1.7.1, Scala 2.12.15, 3.1.3
2 parents a67319e + 3a85047 commit b736c66

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
scalaversion: ["2.11.12", "2.12.14", "2.13.6", "3.0.2"]
16+
scalaversion: ["2.11.12", "2.12.15", "2.13.6", "3.1.3"]
1717
steps:
1818

1919
- uses: actions/checkout@v3
@@ -28,7 +28,7 @@ jobs:
2828
run: sbt -DCI=1 "++${{ matrix.scalaversion }}" dom/scalafmtCheck
2929

3030
- name: Validate api report
31-
if: matrix.scalaversion != '2.11.12' && matrix.scalaversion != '3.0.2'
31+
if: matrix.scalaversion != '2.11.12' && matrix.scalaversion != '3.1.3'
3232
run: ./api-reports/validate "${{ matrix.scalaversion }}"
3333

3434
readme:

.jvmopts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-Xms1G
2+
-Xmx4G
3+
-XX:+UseG1GC

project/Dependencies.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ object Dependencies {
66

77
object Ver {
88
val scala211 = "2.11.12"
9-
val scala212 = "2.12.14"
9+
val scala212 = "2.12.15"
1010
val scala213 = "2.13.6"
11-
val scala3 = "3.0.2"
11+
val scala3 = "3.1.3"
1212
}
1313

1414
object Dep {

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.1")
55
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
66
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
77
addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.11")
8-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
8+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
99
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")

scalafix.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ThisBuild / semanticdbEnabled := true
2-
ThisBuild / semanticdbVersion := "4.4.27"
2+
ThisBuild / semanticdbVersion := scalafixSemanticdb.revision
33
ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value)
44

55
ThisBuild / scalacOptions ++= {

0 commit comments

Comments
 (0)