Skip to content

Commit 860dceb

Browse files
committed
Add dotty to cross-build
1 parent 70d09a6 commit 860dceb

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

.travis.yml

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import: scala/scala-dev:travis/default.yml
55
language: scala
66

77
scala:
8+
- 0.22.0-RC1
89
- 2.11.12
910
- 2.12.10
1011
- 2.13.1
@@ -16,6 +17,11 @@ env:
1617
- ADOPTOPENJDK=11 SCALAJS_VERSION=
1718

1819
matrix:
20+
exclude:
21+
- scala: 0.22.0-RC1
22+
env: ADOPTOPENJDK=8 SCALAJS_VERSION=0.6.32
23+
- scala: 0.22.0-RC1
24+
env: ADOPTOPENJDK=8 SCALAJS_VERSION=1.0.1
1925
include:
2026
- scala: 2.11.12
2127
env: ADOPTOPENJDK=8 SCALANATIVE_VERSION=0.3.9

build.sbt

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
2626
(unmanagedSourceDirectories in Compile).value.map { dir =>
2727
CrossVersion.partialVersion(scalaVersion.value) match {
2828
case Some((2, 13)) => file(dir.getPath ++ "-2.13+")
29+
case Some((0, _)) => file(dir.getPath ++ "-2.13+")
2930
case _ => file(dir.getPath ++ "-2.13-")
3031
}
3132
}

project/plugins.sbt

+2
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
1111

1212
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
1313
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
14+
15+
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.0")

0 commit comments

Comments
 (0)