Skip to content

Commit a7c03df

Browse files
committed
build cleanup: drop old Scala.js cruft
1 parent 72e77d0 commit a7c03df

File tree

3 files changed

+2
-19
lines changed

3 files changed

+2
-19
lines changed

.circleci/config.yml

-8
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,6 @@ workflows:
128128
name: jdk14_3.0
129129
java_version: jdk14
130130
scala_version: 3.0.0-M2
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.12

.travis.yml

-7
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ env:
1515
- SCALAJS_VERSION= ADOPTOPENJDK=11
1616
- SCALAJS_VERSION= ADOPTOPENJDK=13
1717

18-
matrix:
19-
exclude:
20-
- scala: 3.0.0-M1
21-
env: SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8
22-
- scala: 3.0.0-M1
23-
env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8
24-
2518
install:
2619
- git fetch --tags # get all tags for sbt-dynver
2720

build.sbt

+2-4
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,9 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
4343
// but we leave `publishArtifact` set to true, otherwise Sonatype won't let us publish
4444
Compile / doc / sources := (if (isDotty.value) Seq() else (Compile / doc/ sources).value),
4545

46-
scalaModuleMimaPreviousVersion := {
46+
scalaModuleMimaPreviousVersion :=
4747
if (isDotty.value) None // No such release yet
48-
// else if (System.getenv("SCALAJS_VERSION") == "1.0.1") None
49-
else Some("1.3.0")
50-
},
48+
else Some("1.3.0"),
5149
mimaBinaryIssueFilters ++= {
5250
import com.typesafe.tools.mima.core._
5351
import com.typesafe.tools.mima.core.ProblemFilters._

0 commit comments

Comments
 (0)