Skip to content

Commit 38d47af

Browse files
authored
Merge pull request #443 from Philippus/drop-support-for-scalajs-0.6
Drop support for scala.js 0.6.x and update scala.js to 1.1.1
2 parents a7999ce + 5f2f39d commit 38d47af

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

Diff for: .circleci/config.yml

+3-11
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
type: string
6666
scalajs_version:
6767
description: "ScalaJS version"
68-
default: 0.6.33
68+
default: 1.1.1
6969
type: string
7070
environment:
7171
SCALAJS_VERSION: << parameters.scalajs_version >>
@@ -128,19 +128,11 @@ workflows:
128128
name: jdk14_dotty
129129
java_version: jdk14
130130
scala_version: 0.27.0-RC1
131-
- scalajs_job:
132-
name: sjs0.6_2.12
133-
scala_version: 2.12.10
134-
scalajs_version: 0.6.33
135-
- scalajs_job:
136-
name: sjs0.6_2.13
137-
scala_version: 2.13.1
138-
scalajs_version: 0.6.33
139131
- scalajs_job:
140132
name: sjs1.0_2.12
141133
scala_version: 2.12.10
142-
scalajs_version: 1.0.1
134+
scalajs_version: 1.1.1
143135
- scalajs_job:
144136
name: sjs1.0_2.13
145137
scala_version: 2.13.1
146-
scalajs_version: 1.0.1
138+
scalajs_version: 1.1.1

Diff for: .travis.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,14 @@ scala:
1111

1212
env:
1313
- SCALAJS_VERSION= ADOPTOPENJDK=8
14-
- SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8
15-
- SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8
14+
- SCALAJS_VERSION=1.1.1 ADOPTOPENJDK=8
1615
- SCALAJS_VERSION= ADOPTOPENJDK=11
1716
- SCALAJS_VERSION= ADOPTOPENJDK=13
1817

1918
matrix:
2019
exclude:
2120
- scala: 0.27.0-RC1
22-
env: SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8
23-
- scala: 0.27.0-RC1
24-
env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8
21+
env: SCALAJS_VERSION=1.1.1 ADOPTOPENJDK=8
2522

2623
install:
2724
- git fetch --tags # get all tags for sbt-dynver

Diff for: project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.33")
2+
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.1.1")
33

44
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.1")
55
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")

0 commit comments

Comments
 (0)