Skip to content

Add dotty to cross-build #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 18, 2020
Merged
Next Next commit
Add dotty to cross-build
  • Loading branch information
Philippus committed Mar 8, 2020
commit 860dceb3e96504b51a81805b00c147df427e9cbb
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import: scala/scala-dev:travis/default.yml
language: scala

scala:
- 0.22.0-RC1
- 2.11.12
- 2.12.10
- 2.13.1
Expand All @@ -16,6 +17,11 @@ env:
- ADOPTOPENJDK=11 SCALAJS_VERSION=

matrix:
exclude:
- scala: 0.22.0-RC1
env: ADOPTOPENJDK=8 SCALAJS_VERSION=0.6.32
- scala: 0.22.0-RC1
env: ADOPTOPENJDK=8 SCALAJS_VERSION=1.0.1
include:
- scala: 2.11.12
env: ADOPTOPENJDK=8 SCALANATIVE_VERSION=0.3.9
Expand Down
1 change: 1 addition & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
(unmanagedSourceDirectories in Compile).value.map { dir =>
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 13)) => file(dir.getPath ++ "-2.13+")
case Some((0, _)) => file(dir.getPath ++ "-2.13+")
case _ => file(dir.getPath ++ "-2.13-")
}
}
Expand Down
2 changes: 2 additions & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)

addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)

addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.0")