Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update to Scala.js 1.7.1, Scala 2.12.15, 3.1.3 #723

Merged
merged 5 commits into from
Aug 31, 2022
Merged

Update to Scala.js 1.7.1, Scala 2.12.15, 3.1.3 #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b318a27
Update to Scala.js 1.7.1
armanbilge Aug 22, 2022
511cdfe
Update to Scala 3.1.3
armanbilge Aug 22, 2022
963f5eb
Add .jvmopts
armanbilge Aug 22, 2022
cdf7d8f
Update to 2.12.15
armanbilge Aug 31, 2022
3a85047
Mathc semanticdb version to scalafix
armanbilge Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This brings us in line with 1.7.1.
https://www.scala-js.org/news/2021/10/07/announcing-scalajs-1.7.1/

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
View file
Open in desktop
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
View file
Open in desktop
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