diff options
| author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2016-09-28 21:29:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 21:29:26 -0400 |
| commit | 9d3c9e9087a6dc0a4445f9428e02f6e7612470c6 (patch) | |
| tree | ab1aef0726e71ff1ad760b6574489dc20b2d1950 /test/test.scala | |
| parent | ab5ebf2577146b6d8e7c54db4d6bf9ba6230ab57 (diff) | |
| parent | 9b4b9e0c7a747972229fe9dbabe4b6e546c29f4d (diff) | |
| download | cbt-9d3c9e9087a6dc0a4445f9428e02f6e7612470c6.tar.gz cbt-9d3c9e9087a6dc0a4445f9428e02f6e7612470c6.tar.bz2 cbt-9d3c9e9087a6dc0a4445f9428e02f6e7612470c6.zip | |
Merge pull request #235 from cvogt/dotty
Dotty plugin and example project.
Diffstat (limited to 'test/test.scala')
| -rw-r--r-- | test/test.scala | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/test/test.scala b/test/test.scala index 4f0afcd..dfc35d0 100644 --- a/test/test.scala +++ b/test/test.scala @@ -147,20 +147,25 @@ object Main{ } ( - Dependencies( - Resolver( mavenCentral, bintray("tpolecat") ).bind( - lib.ScalaDependency("org.tpolecat","tut-core","0.4.2", scalaMajorVersion="2.11") - ) - ).classpath.strings - ++ + ( + if(System.getenv("CIRCLECI") == null){ + // tenporarily disable on circleci as it seems to have trouble reliably + // downloading from bintray + Dependencies( + Resolver( bintray("tpolecat") ).bind( + lib.ScalaDependency("org.tpolecat","tut-core","0.4.2", scalaMajorVersion="2.11") + ) + ).classpath.strings + } else Nil + ) ++ Dependencies( - Resolver(sonatypeReleases).bind( - MavenDependency("org.cvogt","play-json-extensions_2.11","0.8.0") + Resolver( sonatypeReleases ).bind( + MavenDependency("org.cvogt","scala-extensions_2.11","0.5.1") ) ).classpath.strings ++ Dependencies( - Resolver( mavenCentral, sonatypeSnapshots ).bind( + Resolver( mavenCentral ).bind( MavenDependency("ai.x","lens_2.11","1.0.0") ) ).classpath.strings @@ -193,6 +198,13 @@ object Main{ compile("../examples/scalajs-react-example/js") compile("../examples/scalajs-react-example/jvm") compile("../examples/multi-project-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") |