Skip to content

Commit

Permalink
Merge pull request #43 from exoego/update-scalajs
Browse files Browse the repository at this point in the history
Update Scala.js
  • Loading branch information
olafurpg authored Feb 6, 2020
2 parents a4ba585 + cabc90e commit b7f466e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
scalajs: ["1.0.0-RC2", "0.6.31"]
scalajs: ["1.0.0", "0.6.32"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import sbtcrossproject.CrossPlugin.autoImport.crossProject
import sbtcrossproject.CrossPlugin.autoImport.CrossType
import scala.collection.mutable
val customScalaJSVersion = Option(System.getenv("SCALAJS_VERSION"))
val scalaJSVersion = customScalaJSVersion.getOrElse("1.0.0-RC2")
val scalaJSVersion = customScalaJSVersion.getOrElse("1.0.0")
val scalaNativeVersion = "0.4.0-M2"
def scala213 = "2.13.1"
def scala212 = "2.12.10"
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0-RC2")
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0")

addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
Expand Down

0 comments on commit b7f466e

Please sign in to comment.