Skip to content

Commit 88190e1

Browse files
committed
Test dotty compilation in CI.
1 parent 1a975a9 commit 88190e1

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: scala
33
env:
44
global:
55

6-
script: sbt test:compile "hot -psource=scalap -w1 -f1" "micro/jmh:run -w1 -f1"
6+
script: sbt test:compile "hot -psource=scalap -w1 -f1" "micro/jmh:run -w1 -f1" "; project compilation ; +test"
77

88
jdk:
99
- oraclejdk8

build.sbt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name := "compiler-benchmark"
22

33
version := "1.0-SNAPSHOT"
44

5-
scalaVersion in ThisBuild := "2.11.8"
5+
def scala211 = "2.11.11"
6+
def dottyLatest = "0.2.0-RC1"
7+
scalaVersion in ThisBuild := scala211
68

79
resolvers += "scala-integration" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"
810

@@ -40,6 +42,7 @@ lazy val compilation = addJmh(project).settings(
4042
if (isDotty.value) "ch.epfl.lamp" %% "dotty-compiler" % scalaVersion.value
4143
else scalaOrganization.value % "scala-compiler" % scalaVersion.value
4244
},
45+
crossScalaVersions := List(scala211, dottyLatest),
4346
unmanagedSourceDirectories.in(Compile) +=
4447
sourceDirectory.in(Compile).value / (if (isDotty.value) "dotc" else "scalac"),
4548
mainClass in (Jmh, run) := Some("scala.bench.ScalacBenchmarkRunner"),

0 commit comments

Comments
 (0)