From b318a27ee1bc1d2a666355f934a0d0150d9a7c82 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 22 Aug 2022 23:19:36 +0000 Subject: [PATCH 1/5] Update to Scala.js 1.7.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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") From 511cdfe52bb7e038f4e18c9b832d7e15cf6c8b5b Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 22 Aug 2022 23:21:29 +0000 Subject: [PATCH 2/5] Update to Scala 3.1.3 --- .github/workflows/ci.yml | 4 ++-- project/Dependencies.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab24612de..8e57512ec 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.14", "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/project/Dependencies.scala b/project/Dependencies.scala index 341b6890f..a376c4bf1 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,7 +8,7 @@ object Dependencies { val scala211 = "2.11.12" val scala212 = "2.12.14" val scala213 = "2.13.6" - val scala3 = "3.0.2" + val scala3 = "3.1.3" } object Dep { From 963f5eb2c382c5637ba8d6e4bf6851d672160ff3 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 22 Aug 2022 23:30:10 +0000 Subject: [PATCH 3/5] Add .jvmopts --- .jvmopts | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .jvmopts 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 From cdf7d8f33b01b4371641880aac81dceddb093226 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 31 Aug 2022 02:50:48 +0000 Subject: [PATCH 4/5] Update to 2.12.15 --- .github/workflows/ci.yml | 2 +- project/Dependencies.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e57512ec..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.1.3"] + scalaversion: ["2.11.12", "2.12.15", "2.13.6", "3.1.3"] steps: - uses: actions/checkout@v3 diff --git a/project/Dependencies.scala b/project/Dependencies.scala index a376c4bf1..9c549a088 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ 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.1.3" } From 3a8504712f98f6b75d957586b95104ec200a2c4c Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 31 Aug 2022 02:57:22 +0000 Subject: [PATCH 5/5] Mathc semanticdb version to scalafix --- scalafix.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ++= {