diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab24612de..402a90131 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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: diff --git a/.jvmopts b/.jvmopts new file mode 100644 index 000000000..3f0aee119 --- /dev/null +++ b/.jvmopts @@ -0,0 +1,3 @@ +-Xms1G +-Xmx4G +-XX:+UseG1GC diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 341b6890f..9c549a088 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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 { diff --git a/project/plugins.sbt b/project/plugins.sbt index 97ed02f5f..336ed68d8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") diff --git a/scalafix.sbt b/scalafix.sbt index c14eb48d0..c3048b42f 100644 --- a/scalafix.sbt +++ b/scalafix.sbt @@ -1,5 +1,5 @@ ThisBuild / semanticdbEnabled := true -ThisBuild / semanticdbVersion := "4.4.27" +ThisBuild / semanticdbVersion := scalafixSemanticdb.revision ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value) ThisBuild / scalacOptions ++= {