From 728d8d119e5bf6ab50bae877691d19461ec38d18 Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Sun, 6 Oct 2019 12:21:31 -0400 Subject: [PATCH] Re-enable Coursier in sbt 1.3.2 --- .circleci/config.yml | 2 +- .travis.yml | 2 +- build.sbt | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c5947f46..e08040400 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,7 +27,7 @@ commands: - save_cache: key: sbt-deps-v1-{{ checksum "build.sbt" }} paths: - - "~/.coursier" + - "~/.cache/coursier" - "~/.ivy2/cache" - "~/.sbt" - "~/.m2" diff --git a/.travis.yml b/.travis.yml index 3a1bd6c86..fa663752f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,4 +43,4 @@ cache: - $HOME/.ivy2/cache - $HOME/.sbt - $HOME/.sdkman - - $HOME/.coursier + - $HOME/.cache/coursier diff --git a/build.sbt b/build.sbt index 8d9863a97..8edca710d 100644 --- a/build.sbt +++ b/build.sbt @@ -29,10 +29,6 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform) .settings( name := "scala-xml", - // See https://github.com/sbt/sbt/issues/4995 - // doc task broken in sbt 1.3.0-RC4 and Scala 2.12.9 - useCoursier := false, - scalacOptions ++= { val opts = if (isDotty.value)