File tree Expand file tree Collapse file tree 3 files changed +9
-6
lines changed Expand file tree Collapse file tree 3 files changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -139,8 +139,8 @@ workflows:
139139 - scalajs_job :
140140 name : sjs1.0_2.12
141141 scala_version : 2.12.10
142- scalajs_version : 1.0.0
142+ scalajs_version : 1.0.1
143143 - scalajs_job :
144144 name : sjs1.0_2.13
145145 scala_version : 2.13.1
146- scalajs_version : 1.0.0
146+ scalajs_version : 1.0.1
Original file line number Diff line number Diff line change 1212env :
1313 - SCALAJS_VERSION= ADOPTOPENJDK=8
1414 - SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8
15- - SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=8
15+ - SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8
1616 - SCALAJS_VERSION= ADOPTOPENJDK=11
1717 - SCALAJS_VERSION= ADOPTOPENJDK=13
1818
@@ -21,7 +21,7 @@ matrix:
2121 - scala : 0.22.0-RC1
2222 env : SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8
2323 - scala : 0.22.0-RC1
24- env : SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=8
24+ env : SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8
2525
2626install :
2727 - git fetch --tags # get all tags for sbt-dynver
Original file line number Diff line number Diff line change @@ -43,8 +43,9 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
4343 scalacOptions in Test += " -Xxml:coalescing" ,
4444
4545 scalaModuleMimaPreviousVersion := {
46- if (System .getenv(" SCALAJS_VERSION" ) == " 1.0.0" ) None // No such release yet
47- else Some (" 1.2.0" )
46+ if (isDotty.value) None // No such release yet
47+ // else if (System.getenv("SCALAJS_VERSION") == "1.0.0") None
48+ else Some (" 1.3.0" )
4849 },
4950 mimaBinaryIssueFilters ++= {
5051 import com .typesafe .tools .mima .core ._
@@ -161,6 +162,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
161162 }
162163 )
163164 .jsSettings(
165+ // The config for Travis has an exclude, but sbt-travisci doesn't catch it.
166+ crossScalaVersions -= " 0.22.0-RC1" ,
164167 // Scala.js cannot run forked tests
165168 fork in Test := false
166169 )
You can’t perform that action at this time.
0 commit comments