Skip to content

Drop support for scala.js 0.6.x and update scala.js to 1.1.1 #443

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 15, 2020
Merged

Drop support for scala.js 0.6.x and update scala.js to 1.1.1 #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d85e3f7
Drop support for scala.js 0.6.x
Philippus Sep 7, 2020
5f2f39d
Update scala.js to 1.1.1
Philippus Sep 7, 2020
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
14 changes: 3 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
type: string
scalajs_version:
description: "ScalaJS version"
default: 0.6.33
default: 1.1.1
type: string
environment:
SCALAJS_VERSION: << parameters.scalajs_version >>
Expand Down Expand Up @@ -128,19 +128,11 @@ workflows:
name: jdk14_dotty
java_version: jdk14
scala_version: 0.27.0-RC1
- scalajs_job:
name: sjs0.6_2.12
scala_version: 2.12.10
scalajs_version: 0.6.33
- scalajs_job:
name: sjs0.6_2.13
scala_version: 2.13.1
scalajs_version: 0.6.33
- scalajs_job:
name: sjs1.0_2.12
scala_version: 2.12.10
scalajs_version: 1.0.1
scalajs_version: 1.1.1
- scalajs_job:
name: sjs1.0_2.13
scala_version: 2.13.1
scalajs_version: 1.0.1
scalajs_version: 1.1.1
7 changes: 2 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,14 @@ scala:

env:
- SCALAJS_VERSION= ADOPTOPENJDK=8
- SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8
- SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8
- SCALAJS_VERSION=1.1.1 ADOPTOPENJDK=8
- SCALAJS_VERSION= ADOPTOPENJDK=11
- SCALAJS_VERSION= ADOPTOPENJDK=13

matrix:
exclude:
- scala: 0.27.0-RC1
env: SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8
- scala: 0.27.0-RC1
env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8
env: SCALAJS_VERSION=1.1.1 ADOPTOPENJDK=8

install:
- git fetch --tags # get all tags for sbt-dynver
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
@@ -1,5 +1,5 @@
val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.33")
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.1.1")

addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
Expand Down