Skip to content

Commit c9c3459

Browse files
authored
Merge pull request #13 from sjrd/upgrades
Upgrade to Scala 2.12.10 and 2.13.1, and add Scala.js 1.0.0-RC1.
2 parents e6d9e9f + 9b157f2 commit c9c3459

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.travis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,24 @@ language: scala
33
scala:
44
- 2.10.7
55
- 2.11.12
6-
- 2.12.8
7-
- 2.13.0
6+
- 2.12.10
7+
- 2.13.1
88
jdk:
9-
- oraclejdk8
9+
- openjdk8
1010
env:
1111
matrix:
1212
- SCALAJS_VERSION=
1313
- SCALAJS_VERSION=0.6.28
1414
- SCALAJS_VERSION=1.0.0-M8
15+
- SCALAJS_VERSION=1.0.0-RC1
1516

1617
matrix:
1718
exclude:
1819
# 2.10 is not supported in Scala.js 1.x
1920
- scala: 2.10.7
2021
env: SCALAJS_VERSION=1.0.0-M8
22+
- scala: 2.10.7
23+
env: SCALAJS_VERSION=1.0.0-RC1
2124

2225
script:
2326
- |

build.sbt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import sbtcrossproject.{crossProject, CrossType}
44
val previousVersion = "0.1.0"
55

66
inThisBuild(Def.settings(
7-
crossScalaVersions := Seq("2.12.8", "2.10.7", "2.11.12", "2.13.0"),
7+
crossScalaVersions := Seq("2.12.10", "2.10.7", "2.11.12", "2.13.1"),
88
scalaVersion := crossScalaVersions.value.head,
99
version := "0.1.1-SNAPSHOT",
1010
organization := "org.portable-scala",
@@ -31,8 +31,10 @@ lazy val `portable-scala-reflect` = crossProject(JSPlatform, JVMPlatform)
3131
.settings(
3232
scalacOptions in (Compile, doc) -= "-Xfatal-warnings",
3333

34-
mimaPreviousArtifacts +=
35-
organization.value %%% moduleName.value % previousVersion,
34+
mimaPreviousArtifacts ++= {
35+
if (scalaJSVersion == "1.0.0-RC1") Set.empty
36+
else Set(organization.value %%% moduleName.value % previousVersion)
37+
},
3638

3739
publishMavenStyle := true,
3840
publishTo := {

0 commit comments

Comments
 (0)