diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-09-28 20:49:45 -0400 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-09-28 20:49:45 -0400 |
| commit | 4569e126be9970f812d725733b0ea678b4077383 (patch) | |
| tree | 914275faed83defbdc6bd8bec98c2d548b26df4f | |
| parent | cc451640063be53c2fd815ade017d988ab2af564 (diff) | |
| download | cbt-4569e126be9970f812d725733b0ea678b4077383.tar.gz cbt-4569e126be9970f812d725733b0ea678b4077383.tar.bz2 cbt-4569e126be9970f812d725733b0ea678b4077383.zip | |
set circle back to java7 to make sure cbt works there
and disable dotty tests for java7, but run them otherwise, e.g. locally
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | test/test.scala | 10 |
2 files changed, 8 insertions, 4 deletions
@@ -1,6 +1,6 @@ machine: java: - version: oraclejdk8 + version: oraclejdk7 dependencies: cache_directories: diff --git a/test/test.scala b/test/test.scala index ca64d99..bb7e89a 100644 --- a/test/test.scala +++ b/test/test.scala @@ -193,9 +193,13 @@ object Main{ compile("../examples/scalajs-react-example/js") compile("../examples/scalajs-react-example/jvm") compile("../examples/multi-project-example") - compile("../examples/dotty-example") - task("run","../examples/dotty-example") - task("doc","../examples/dotty-example") + if(sys.props("java.version").startsWith("1.7")){ + System.err.println("\nskipping dotty tests on Java 7") + } else { + compile("../examples/dotty-example") + task("run","../examples/dotty-example") + task("doc","../examples/dotty-example") + } task("fastOptJS","../examples/scalajs-react-example/js") task("fullOptJS","../examples/scalajs-react-example/js") compile("../examples/uber-jar-example") |