Skip to content

Commit

Permalink
Merge pull request #723 from scala-js/issue/706
Browse files Browse the repository at this point in the history
Update to Scala.js 1.7.1, Scala 2.12.15, 3.1.3
  • Loading branch information
armanbilge authored Aug 31, 2022
2 parents a67319e + 3a85047 commit b736c66
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
scalaversion: ["2.11.12", "2.12.14", "2.13.6", "3.0.2"]
scalaversion: ["2.11.12", "2.12.15", "2.13.6", "3.1.3"]
steps:

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

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

readme:
Expand Down
3 changes: 3 additions & 0 deletions .jvmopts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-Xms1G
-Xmx4G
-XX:+UseG1GC
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ object Dependencies {

object Ver {
val scala211 = "2.11.12"
val scala212 = "2.12.14"
val scala212 = "2.12.15"
val scala213 = "2.13.6"
val scala3 = "3.0.2"
val scala3 = "3.1.3"
}

object Dep {
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.1")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.11")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
2 changes: 1 addition & 1 deletion scalafix.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ThisBuild / semanticdbEnabled := true
ThisBuild / semanticdbVersion := "4.4.27"
ThisBuild / semanticdbVersion := scalafixSemanticdb.revision
ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value)

ThisBuild / scalacOptions ++= {
Expand Down

0 comments on commit b736c66

Please sign in to comment.