diff options
| author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-08 21:05:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-08 21:05:45 -0500 |
| commit | 28d7497fc900a2b410c84da38ea104dcc638ef1e (patch) | |
| tree | c85db286844611d0baa15ec8531c69c92f8bab1e | |
| parent | 34ee0fd1015a4aa0c657dbd3a53b9d3c908045b9 (diff) | |
| parent | e72abced5e30cbcbfade4e979aa9d3d6505f306d (diff) | |
| download | cbt-28d7497fc900a2b410c84da38ea104dcc638ef1e.tar.gz cbt-28d7497fc900a2b410c84da38ea104dcc638ef1e.tar.bz2 cbt-28d7497fc900a2b410c84da38ea104dcc638ef1e.zip | |
Merge pull request #404 from cvogt/fix-broken-test
no hashes on bintray for this and mavenCentral deps
| -rw-r--r-- | circle.yml | 4 | ||||
| -rw-r--r-- | test/test.scala | 27 |
2 files changed, 13 insertions, 18 deletions
@@ -3,8 +3,8 @@ machine: version: oraclejdk8 dependencies: - cache_directories: - - "cache" +# cache_directories: +# - "cache" override: - ./cbt compile - ./cbt direct diff --git a/test/test.scala b/test/test.scala index d93c040..59a85ac 100644 --- a/test/test.scala +++ b/test/test.scala @@ -155,22 +155,17 @@ object Main{ } ( - ( - 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","scala-extensions_2.11","0.5.1") - ) - ).classpath.strings + Dependencies( + Resolver( bintray("tpolecat"), mavenCentral ).bind( + lib.ScalaDependency("org.tpolecat","tut-core","0.4.2", scalaMajorVersion="2.11", verifyHash = false) + ) + ).classpath.strings + ++ + Dependencies( + Resolver( sonatypeReleases ).bind( + MavenDependency("org.cvogt","scala-extensions_2.11","0.5.1") + ) + ).classpath.strings ++ Dependencies( Resolver( mavenCentral ).bind( |