From aeac9e719e658e9326378c8d57e2f2f886e4f165 Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 14:00:36 -0600
Subject: [PATCH 01/18] Add failing test cases

---
 .../johnynek/bazel_deps/CoursierTest.scala    | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/test/scala/com/github/johnynek/bazel_deps/CoursierTest.scala b/test/scala/com/github/johnynek/bazel_deps/CoursierTest.scala
index 54ce5ec0..90f9f31a 100644
--- a/test/scala/com/github/johnynek/bazel_deps/CoursierTest.scala
+++ b/test/scala/com/github/johnynek/bazel_deps/CoursierTest.scala
@@ -226,4 +226,47 @@ dependencies:
 
     assert(Writer.targets(normalized, model).isLeft)
   }
+
+  test("version alignment breaks resolution") {
+    def configForVersions(firstVersion: String, secondVersion: String) = s"""
+options:
+  buildHeader: [ "load(\\"@io_bazel_rules_scala//scala:scala_import.bzl\\", \\"scala_import\\")" ]
+  languages: [ "java", "scala:2.11.8" ]
+  resolverType: "coursier"
+  resolvers:
+    - id: "mavencentral"
+      type: "default"
+      url: https://repo.maven.apache.org/maven2/
+  transitivity: runtime_deps
+  versionConflictPolicy: highest
+
+dependencies:
+  org.kie:
+    kie-api:
+      lang: java
+      version: "${firstVersion}"
+
+  org.kie.server:
+    kie:
+      lang: java
+      modules: [ "server-api", "server-client" ]
+      version: "${secondVersion}"
+"""
+
+    def testConfig(firstVersion: String, secondVersion: String): Unit = {
+      val model = Decoders.decodeModel(Yaml, configForVersions(firstVersion, secondVersion)).right.get
+      val (normalized, shas, duplicates) = MakeDeps.runResolve(model, null).get
+      val written = Writer.targets(normalized, model)
+
+      written match {
+        case Left(errors) =>
+            assert(false, errors)
+          case Right(_) => ()
+      }
+    }
+
+    testConfig("7.26.0.Final", "7.27.0.Final")
+    testConfig("7.27.0.Final", "7.26.0.Final")
+    testConfig("7.27.0.Final", "7.27.0.Final")
+  }
 }

From bc53a6f5c5b6f78ec3c3c6adb883279b7a2ce544 Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:25:33 -0600
Subject: [PATCH 02/18] cp

---
 3rdparty/workspace.bzl                        |  4 +--
 dependencies.yaml                             |  4 +--
 .../bazel_deps/CoursierResolver.scala         | 33 ++++++++++++++-----
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index 01a60653..6a8267ce 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -92,8 +92,8 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M10", "lang": "scala", "sha1": "e87779f9092e8c365ee469fe1c0b317d1535d3c0", "sha256": "d58359d49f97b80f10c437f87c9de267632a090a34e0529838025bb1a3784764", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M10/coursier-cache_2.11-1.1.0-M10.jar", "source": {"sha1": "ba28e94e7e85ffea9342303aa37d5f1956471703", "sha256": "a05a8589edb18764c93bc924e738aba6315c530f2e239290f1664d352d6e3735", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M10/coursier-cache_2.11-1.1.0-M10-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M10", "lang": "scala", "sha1": "87adde5db9407289f7ffd337f00d6a9bf2030843", "sha256": "9628a008fad80c46499bdd680095f4c9a8dc5a781a184f20305ec0d3d6b7ba43", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M10/coursier-core_2.11-1.1.0-M10.jar", "source": {"sha1": "f07262adb12dace6b7eced5d8d8c06ffcb9ab6a0", "sha256": "e94ede761be9af8320a846ff618eeef45ba420e4628388d9e0a713884b93d0d7", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M10/coursier-core_2.11-1.1.0-M10-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M11", "lang": "scala", "sha1": "f11f3c0b206557a4252ef26d9c10f64382c4482c", "sha256": "91c3112ae7c49219cf0f525457813c67fd1bce86eafecbf11916412fed6a548a", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M11/coursier-cache_2.11-1.1.0-M11.jar", "source": {"sha1": "0a8d078ccc3c3da8328d7616b36c338df895ffd4", "sha256": "3b9bebdaed511b16fd0a3a2bd3abd918675ce9218a7de3bf2d091eb3810de4e1", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M11/coursier-cache_2.11-1.1.0-M11-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M11", "lang": "scala", "sha1": "ff3bbb5cdafdabd456938927eff028af1aee9e02", "sha256": "1c3e929f9a7c1cc7321b069f7639ace6a13b80764c82c7a77bdecaaad44d80f6", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M11/coursier-core_2.11-1.1.0-M11.jar", "source": {"sha1": "3bb19623dd8ad8b0c579c23c2743e742105d6af4", "sha256": "5ab2b4f50224b450c7d02feb19bfc11281751626d8158f89f559d9faff68440f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M11/coursier-core_2.11-1.1.0-M11-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index 9f581aaf..14aff2f9 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -51,8 +51,8 @@ dependencies:
   io.get-coursier:
     coursier:
       lang: scala
-      modules: [ "cache", "core" ]
-      version: "1.1.0-M10"
+      modules: [ "cache", "core"]
+      version: "1.1.0-M11"
 
   org.apache.maven:
     maven:
diff --git a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
index 9773a4be..b27d64c7 100644
--- a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
+++ b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
@@ -1,7 +1,8 @@
 package com.github.johnynek.bazel_deps
 
-import coursier.{Artifact, Cache, CachePolicy, Dependency, Fetch, Project, Resolution}
-import coursier.util.{Schedulable, Task}
+import coursier.{Artifact, Dependency, ResolutionProcess, Project, Resolution}
+import coursier.{Cache, CachePolicy}
+import coursier.util.Task
 import cats.MonadError
 import cats.data.{Nested, NonEmptyList, Validated, ValidatedNel}
 import cats.implicits._
@@ -17,7 +18,21 @@ import scala.concurrent.duration.Duration
 object CoursierResolver {
   // 12 concurrent downloads
   // most downloads are tiny sha downloads so try keep things alive
-  lazy val downloadPool = Schedulable.fixedThreadPool(12)
+  lazy val downloadPool = {
+    import java.util.concurrent.{ExecutorService, Executors, ThreadFactory}
+Executors.newFixedThreadPool(
+      12,
+      // from scalaz.concurrent.Strategy.DefaultDaemonThreadFactory
+      new ThreadFactory {
+        val defaultThreadFactory = Executors.defaultThreadFactory()
+        def newThread(r: Runnable) = {
+          val t = defaultThreadFactory.newThread(r)
+          t.setDaemon(true)
+          t
+        }
+      }
+    )
+}
 }
 class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTimeout: Duration) extends Resolver[Task] {
   // TODO: add support for a local file cache other than ivy
@@ -32,7 +47,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
     }
   }
 
-  private[this] val fetch = Fetch.from(repos, Cache.fetch[Task](cachePolicy = CachePolicy.FetchMissing, pool = CoursierResolver.downloadPool))
+  private[this] val fetch = ResolutionProcess.fetch(repos, Cache.fetch[Task](cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool))
 
   private[this] val logger = LoggerFactory.getLogger("bazel_deps.CoursierResolver")
 
@@ -84,7 +99,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
       def downloadSha(digestType: DigestType, a: coursier.Artifact): Task[Option[ShaValue]] = {
         // Because Cache.file is hijacked to download SHAs directly (rather than signed artifacts) checksum verification
         // is turned off. Checksums don't themselves have checksum files.
-        Cache.file[Task](a, checksums = Seq(None), cachePolicy = CachePolicy.FetchMissing, pool = CoursierResolver.downloadPool).run.map {
+        Cache.file[Task](a, checksums = Seq(None), cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool).run.map {
           case Left(error) =>
             logger.info(s"failure to download ${a.url}, ${error.describe}")
             None
@@ -98,7 +113,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
       }
 
       def computeSha(digestType: DigestType, artifact: coursier.Artifact): Task[ShaValue] =
-        Cache.file[Task](artifact, cachePolicy = CachePolicy.FetchMissing, pool = CoursierResolver.downloadPool).run.flatMap { e =>
+        Cache.file[Task](artifact, cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool).run.flatMap { e =>
           resolverMonad.fromTry(e match {
             case Left(error) =>
               Failure(FileErrorException(error))
@@ -160,8 +175,8 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
 
       val module = coursier.Module(Organization(c.group.asString), ModuleName(c.artifact.artifactId), Map.empty)
       val version = c.version.asString
-      val f = Cache.fetch[Task](checksums = Seq(Some("SHA-1"), None), cachePolicy = CachePolicy.FetchMissing, pool = CoursierResolver.downloadPool)
-      val task = Fetch.find[Task](repos, module, version, f).run
+      val f = Cache.fetch[Task](checksums = Seq(Some("SHA-1"), None), cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool)
+      val task = ResolutionProcess.fetchOne[Task](repos, module, version, f).run
 
       /*
        * we use Nested here to accumulate all the errors so we can
@@ -246,7 +261,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
         artifactFromDep(cd),
         Version(cd.version))
 
-    val roots: Set[coursier.Dependency] = coords.map(toDep).toSet
+    val roots: Seq[coursier.core.Dependency] = coords.map(toDep).toSet.toSeq
 
     Resolution(roots).process.run(fetch).map { res =>
       val depCache = res.finalDependenciesCache

From d1f212a2bb646a948167c3d32f2f8cede2641b8f Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:28:09 -0600
Subject: [PATCH 03/18] cp

---
 3rdparty/workspace.bzl | 4 ++--
 dependencies.yaml      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index 6a8267ce..9de090da 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -92,8 +92,8 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M11", "lang": "scala", "sha1": "f11f3c0b206557a4252ef26d9c10f64382c4482c", "sha256": "91c3112ae7c49219cf0f525457813c67fd1bce86eafecbf11916412fed6a548a", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M11/coursier-cache_2.11-1.1.0-M11.jar", "source": {"sha1": "0a8d078ccc3c3da8328d7616b36c338df895ffd4", "sha256": "3b9bebdaed511b16fd0a3a2bd3abd918675ce9218a7de3bf2d091eb3810de4e1", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M11/coursier-cache_2.11-1.1.0-M11-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M11", "lang": "scala", "sha1": "ff3bbb5cdafdabd456938927eff028af1aee9e02", "sha256": "1c3e929f9a7c1cc7321b069f7639ace6a13b80764c82c7a77bdecaaad44d80f6", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M11/coursier-core_2.11-1.1.0-M11.jar", "source": {"sha1": "3bb19623dd8ad8b0c579c23c2743e742105d6af4", "sha256": "5ab2b4f50224b450c7d02feb19bfc11281751626d8158f89f559d9faff68440f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M11/coursier-core_2.11-1.1.0-M11-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M11-1", "lang": "scala", "sha1": "e02dc486aa68c359336cb6fe4a88eb2e304716ee", "sha256": "6a2b6ad481cb3d1e0180d943cd65a5c4cdeae6f675645c1fc44c42fe8dc0dbfe", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M11-1/coursier-cache_2.11-1.1.0-M11-1.jar", "source": {"sha1": "06d60b2faa5c3cd7f52eeff93063982931959c76", "sha256": "913eac37399f27db9d4272ab9ede70c8d6f51cfa37d778969698ae243628b777", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M11-1/coursier-cache_2.11-1.1.0-M11-1-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M11-1", "lang": "scala", "sha1": "df46628cf5c258e4c25a0edfe296829c7237d8b0", "sha256": "cc9ec4018e7cf772b460b568f5855448182aa7dedcd57311a2595a0a3fd1c50c", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M11-1/coursier-core_2.11-1.1.0-M11-1.jar", "source": {"sha1": "725a2b61c986427eb38dbc1ea1053971909ffd46", "sha256": "233a97c0f1b8de7c82238830623cc7a8cd8c70534424f0803f6be0b2587cf78e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M11-1/coursier-core_2.11-1.1.0-M11-1-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index 14aff2f9..bd81e1db 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core"]
-      version: "1.1.0-M11"
+      version: "1.1.0-M11-1"
 
   org.apache.maven:
     maven:

From 25464327463458026eb42ad14ea85e7650cdeaad Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:36:51 -0600
Subject: [PATCH 04/18] cp

---
 3rdparty/jvm/io/get_coursier/BUILD              | 17 +++++++++++++++++
 3rdparty/workspace.bzl                          |  5 +++--
 dependencies.yaml                               |  4 ++--
 src/scala/com/github/johnynek/bazel_deps/BUILD  |  1 +
 .../johnynek/bazel_deps/CoursierResolver.scala  | 12 ++++++------
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/3rdparty/jvm/io/get_coursier/BUILD b/3rdparty/jvm/io/get_coursier/BUILD
index 12d571e0..c24d94cf 100644
--- a/3rdparty/jvm/io/get_coursier/BUILD
+++ b/3rdparty/jvm/io/get_coursier/BUILD
@@ -1,5 +1,22 @@
 load("@io_bazel_rules_scala//scala:scala_import.bzl", "scala_import")
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
+scala_import(
+    name = "coursier",
+    jars = [
+        "//external:jar/io/get_coursier/coursier_2_11"
+    ],
+    runtime_deps = [
+        "//3rdparty/jvm/org/scala_lang:scala_library",
+        ":coursier_cache",
+        ":coursier_core"
+    ],
+    visibility = [
+        "//visibility:public"
+    ]
+)
+
+
+
 scala_import(
     name = "coursier_cache",
     jars = [
diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index 9de090da..2ee65b12 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -92,8 +92,9 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M11-1", "lang": "scala", "sha1": "e02dc486aa68c359336cb6fe4a88eb2e304716ee", "sha256": "6a2b6ad481cb3d1e0180d943cd65a5c4cdeae6f675645c1fc44c42fe8dc0dbfe", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M11-1/coursier-cache_2.11-1.1.0-M11-1.jar", "source": {"sha1": "06d60b2faa5c3cd7f52eeff93063982931959c76", "sha256": "913eac37399f27db9d4272ab9ede70c8d6f51cfa37d778969698ae243628b777", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M11-1/coursier-cache_2.11-1.1.0-M11-1-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M11-1", "lang": "scala", "sha1": "df46628cf5c258e4c25a0edfe296829c7237d8b0", "sha256": "cc9ec4018e7cf772b460b568f5855448182aa7dedcd57311a2595a0a3fd1c50c", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M11-1/coursier-core_2.11-1.1.0-M11-1.jar", "source": {"sha1": "725a2b61c986427eb38dbc1ea1053971909ffd46", "sha256": "233a97c0f1b8de7c82238830623cc7a8cd8c70534424f0803f6be0b2587cf78e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M11-1/coursier-core_2.11-1.1.0-M11-1-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M11-2", "lang": "scala", "sha1": "5889fc5150e2bca9ce97bda5788ed823e8b2e2b9", "sha256": "d7a91358c8e6691d4bd6cfac9a5346c69c0bb04e7950b630a89f0657898756dc", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M11-2/coursier-cache_2.11-1.1.0-M11-2.jar", "source": {"sha1": "ff5d224ef033bcf2a0f640fcf90e892c24d3c99d", "sha256": "cece8ed821054b6f8e71cef34c9c00b4d59579f1127dc48dec6fe9cb23522f38", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M11-2/coursier-cache_2.11-1.1.0-M11-2-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M11-2", "lang": "scala", "sha1": "213947413632934f93b63ff5e75338724a8bf301", "sha256": "b916f50e23d4e2503207a9fd2b7a3da327170200b273a744e89bdd3b2dcf8159", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M11-2/coursier-core_2.11-1.1.0-M11-2.jar", "source": {"sha1": "6c7dd82946b720d7cf24a22871b8e5609c7ed0f7", "sha256": "fc4a76e52413885afe4857f35c679c23fe710a74af8dea52b06876d8622751bf", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M11-2/coursier-core_2.11-1.1.0-M11-2-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M11-2", "lang": "scala", "sha1": "9ea407a504bb3f206bbd6bbe4a38dde1271da4ff", "sha256": "448fa27715255845b15853935d17f79dad5137f78b594404e74a99408c5a0a78", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M11-2/coursier_2.11-1.1.0-M11-2.jar", "source": {"sha1": "f01a3d60dcc46a48677dcbb63e7be315bc8eca93", "sha256": "391cd53dd5027577b4866399c059f7c810237d765dacdd1f4d0ce73c3e8257c4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M11-2/coursier_2.11-1.1.0-M11-2-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index bd81e1db..06f2bf95 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -51,8 +51,8 @@ dependencies:
   io.get-coursier:
     coursier:
       lang: scala
-      modules: [ "cache", "core"]
-      version: "1.1.0-M11-1"
+      modules: [ "cache", "core", ""]
+      version: "1.1.0-M11-2"
 
   org.apache.maven:
     maven:
diff --git a/src/scala/com/github/johnynek/bazel_deps/BUILD b/src/scala/com/github/johnynek/bazel_deps/BUILD
index cf32e7b6..6e55d813 100644
--- a/src/scala/com/github/johnynek/bazel_deps/BUILD
+++ b/src/scala/com/github/johnynek/bazel_deps/BUILD
@@ -53,6 +53,7 @@ scala_library(
     deps = [
         "//3rdparty/jvm/io/get_coursier:coursier_core",
         "//3rdparty/jvm/io/get_coursier:coursier_cache",
+        "//3rdparty/jvm/io/get_coursier:coursier",
         "//3rdparty/jvm/org/slf4j:slf4j_api",
         "//3rdparty/jvm/org/typelevel:cats_core",
         ":resolver",
diff --git a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
index b27d64c7..0d575bb3 100644
--- a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
+++ b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
@@ -1,7 +1,7 @@
 package com.github.johnynek.bazel_deps
 
 import coursier.{Artifact, Dependency, ResolutionProcess, Project, Resolution}
-import coursier.{Cache, CachePolicy}
+import coursier.cache.{FileCache, CachePolicy}
 import coursier.util.Task
 import cats.MonadError
 import cats.data.{Nested, NonEmptyList, Validated, ValidatedNel}
@@ -47,7 +47,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
     }
   }
 
-  private[this] val fetch = ResolutionProcess.fetch(repos, Cache.fetch[Task](cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool))
+  private[this] val fetch = ResolutionProcess.fetch(repos, FileCache(cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool).fetch)
 
   private[this] val logger = LoggerFactory.getLogger("bazel_deps.CoursierResolver")
 
@@ -80,7 +80,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
 
   def run[A](fa: Task[A]): Try[A] = Try(Await.result(fa.value(ec), runTimeout))
 
-  case class FileErrorException(error: coursier.FileError) extends Exception(error.describe)
+  case class FileErrorException(error: coursier.cache.ArtifactError) extends Exception(error.describe)
   case class DownloadFailures(messages: NonEmptyList[String]) extends Exception("resolution errors:\n" + messages.toList.mkString("\n"))
 
   def getShas(m: List[MavenCoordinate]): Task[SortedMap[MavenCoordinate, ResolvedShasValue]] = {
@@ -99,7 +99,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
       def downloadSha(digestType: DigestType, a: coursier.Artifact): Task[Option[ShaValue]] = {
         // Because Cache.file is hijacked to download SHAs directly (rather than signed artifacts) checksum verification
         // is turned off. Checksums don't themselves have checksum files.
-        Cache.file[Task](a, checksums = Seq(None), cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool).run.map {
+        FileCache(checksums = Seq(None), cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool).file(a).run.map {
           case Left(error) =>
             logger.info(s"failure to download ${a.url}, ${error.describe}")
             None
@@ -113,7 +113,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
       }
 
       def computeSha(digestType: DigestType, artifact: coursier.Artifact): Task[ShaValue] =
-        Cache.file[Task](artifact, cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool).run.flatMap { e =>
+        FileCache(cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool).file(artifact).run.flatMap { e =>
           resolverMonad.fromTry(e match {
             case Left(error) =>
               Failure(FileErrorException(error))
@@ -175,7 +175,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
 
       val module = coursier.Module(Organization(c.group.asString), ModuleName(c.artifact.artifactId), Map.empty)
       val version = c.version.asString
-      val f = Cache.fetch[Task](checksums = Seq(Some("SHA-1"), None), cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool)
+      val f = FileCache(checksums = Seq(Some("SHA-1"), None), cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool).fetch
       val task = ResolutionProcess.fetchOne[Task](repos, module, version, f).run
 
       /*

From f5ac6b1a1ea4f3e2d6970f93600b0e5d35e131e4 Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:42:18 -0600
Subject: [PATCH 05/18] cp

---
 3rdparty/workspace.bzl                               |  6 +++---
 dependencies.yaml                                    |  2 +-
 .../johnynek/bazel_deps/CoursierResolver.scala       | 12 ++++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index 2ee65b12..926b6c69 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -92,9 +92,9 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M11-2", "lang": "scala", "sha1": "5889fc5150e2bca9ce97bda5788ed823e8b2e2b9", "sha256": "d7a91358c8e6691d4bd6cfac9a5346c69c0bb04e7950b630a89f0657898756dc", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M11-2/coursier-cache_2.11-1.1.0-M11-2.jar", "source": {"sha1": "ff5d224ef033bcf2a0f640fcf90e892c24d3c99d", "sha256": "cece8ed821054b6f8e71cef34c9c00b4d59579f1127dc48dec6fe9cb23522f38", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M11-2/coursier-cache_2.11-1.1.0-M11-2-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M11-2", "lang": "scala", "sha1": "213947413632934f93b63ff5e75338724a8bf301", "sha256": "b916f50e23d4e2503207a9fd2b7a3da327170200b273a744e89bdd3b2dcf8159", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M11-2/coursier-core_2.11-1.1.0-M11-2.jar", "source": {"sha1": "6c7dd82946b720d7cf24a22871b8e5609c7ed0f7", "sha256": "fc4a76e52413885afe4857f35c679c23fe710a74af8dea52b06876d8622751bf", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M11-2/coursier-core_2.11-1.1.0-M11-2-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M11-2", "lang": "scala", "sha1": "9ea407a504bb3f206bbd6bbe4a38dde1271da4ff", "sha256": "448fa27715255845b15853935d17f79dad5137f78b594404e74a99408c5a0a78", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M11-2/coursier_2.11-1.1.0-M11-2.jar", "source": {"sha1": "f01a3d60dcc46a48677dcbb63e7be315bc8eca93", "sha256": "391cd53dd5027577b4866399c059f7c810237d765dacdd1f4d0ce73c3e8257c4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M11-2/coursier_2.11-1.1.0-M11-2-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M12", "lang": "scala", "sha1": "293546234b023104a1dce51d50250ca2f52934d7", "sha256": "af951b5c7bb793cfde4a1395d1b381bada7388886013974a12d3c88297f77fe7", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M12/coursier-cache_2.11-1.1.0-M12.jar", "source": {"sha1": "8ded3ca7acbe6e1a35d3d0d963558d027c056b16", "sha256": "0bfd3834029e953bec04ccc5c8f9de7dec33b57f1bae2cabaa4c052fdd6a5598", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M12/coursier-cache_2.11-1.1.0-M12-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M12", "lang": "scala", "sha1": "e01271713df565e4c27ece5205b85cf95a6227ae", "sha256": "57ba0a7797a083bb49b986cec4a7ba85a8938f56d2ab527f51c7d2b42d51766e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M12/coursier-core_2.11-1.1.0-M12.jar", "source": {"sha1": "62e8ce86ff098d990cd841b2678170630db8a2b9", "sha256": "f8afa62a6cf6c4d8b28d3e932a8e440f09acce5719bf74f0b174f738878f847a", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M12/coursier-core_2.11-1.1.0-M12-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M12", "lang": "scala", "sha1": "9a9269fdb0adec329dc1f2d97255485421e8465e", "sha256": "e10030af51cbb10d5710c8cf4e54930962f0e791af2122c5e3313ea723596f38", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M12/coursier_2.11-1.1.0-M12.jar", "source": {"sha1": "a10a6d0387d30687e5593623f9c13baa99c608d9", "sha256": "3ca5eea278f081b2448505f9b44764588a224af3365552cfa28e05d8398a4c05", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M12/coursier_2.11-1.1.0-M12-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index 06f2bf95..03d0d953 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core", ""]
-      version: "1.1.0-M11-2"
+      version: "1.1.0-M12"
 
   org.apache.maven:
     maven:
diff --git a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
index 0d575bb3..afc63e39 100644
--- a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
+++ b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
@@ -47,7 +47,9 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
     }
   }
 
-  private[this] val fetch = ResolutionProcess.fetch(repos, FileCache(cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool).fetch)
+  private[this] val fetch = ResolutionProcess.fetch(repos, FileCache().
+    withCachePolicies(Seq(CachePolicy.FetchMissing))
+    .withPool(CoursierResolver.downloadPool).fetch)
 
   private[this] val logger = LoggerFactory.getLogger("bazel_deps.CoursierResolver")
 
@@ -99,7 +101,9 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
       def downloadSha(digestType: DigestType, a: coursier.Artifact): Task[Option[ShaValue]] = {
         // Because Cache.file is hijacked to download SHAs directly (rather than signed artifacts) checksum verification
         // is turned off. Checksums don't themselves have checksum files.
-        FileCache(checksums = Seq(None), cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool).file(a).run.map {
+        FileCache().withChecksums(Seq(None))
+        .withCachePolicies(Seq(CachePolicy.FetchMissing))
+        .withPool(CoursierResolver.downloadPool).file(a).run.map {
           case Left(error) =>
             logger.info(s"failure to download ${a.url}, ${error.describe}")
             None
@@ -113,7 +117,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
       }
 
       def computeSha(digestType: DigestType, artifact: coursier.Artifact): Task[ShaValue] =
-        FileCache(cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool).file(artifact).run.flatMap { e =>
+        FileCache().withCachePolicies(Seq(CachePolicy.FetchMissing)).withPool(CoursierResolver.downloadPool).file(artifact).run.flatMap { e =>
           resolverMonad.fromTry(e match {
             case Left(error) =>
               Failure(FileErrorException(error))
@@ -175,7 +179,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
 
       val module = coursier.Module(Organization(c.group.asString), ModuleName(c.artifact.artifactId), Map.empty)
       val version = c.version.asString
-      val f = FileCache(checksums = Seq(Some("SHA-1"), None), cachePolicies = Seq(CachePolicy.FetchMissing), pool = CoursierResolver.downloadPool).fetch
+      val f = FileCache().withChecksums(Seq(Some("SHA-1"), None)).withCachePolicies(Seq(CachePolicy.FetchMissing)).withPool(CoursierResolver.downloadPool).fetch
       val task = ResolutionProcess.fetchOne[Task](repos, module, version, f).run
 
       /*

From 9f8e56bda00c8846092c582ccc78b60a2a870473 Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:42:51 -0600
Subject: [PATCH 06/18] cp

---
 3rdparty/workspace.bzl | 6 +++---
 dependencies.yaml      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index 926b6c69..63a3d0af 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -92,9 +92,9 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M12", "lang": "scala", "sha1": "293546234b023104a1dce51d50250ca2f52934d7", "sha256": "af951b5c7bb793cfde4a1395d1b381bada7388886013974a12d3c88297f77fe7", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M12/coursier-cache_2.11-1.1.0-M12.jar", "source": {"sha1": "8ded3ca7acbe6e1a35d3d0d963558d027c056b16", "sha256": "0bfd3834029e953bec04ccc5c8f9de7dec33b57f1bae2cabaa4c052fdd6a5598", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M12/coursier-cache_2.11-1.1.0-M12-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M12", "lang": "scala", "sha1": "e01271713df565e4c27ece5205b85cf95a6227ae", "sha256": "57ba0a7797a083bb49b986cec4a7ba85a8938f56d2ab527f51c7d2b42d51766e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M12/coursier-core_2.11-1.1.0-M12.jar", "source": {"sha1": "62e8ce86ff098d990cd841b2678170630db8a2b9", "sha256": "f8afa62a6cf6c4d8b28d3e932a8e440f09acce5719bf74f0b174f738878f847a", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M12/coursier-core_2.11-1.1.0-M12-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M12", "lang": "scala", "sha1": "9a9269fdb0adec329dc1f2d97255485421e8465e", "sha256": "e10030af51cbb10d5710c8cf4e54930962f0e791af2122c5e3313ea723596f38", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M12/coursier_2.11-1.1.0-M12.jar", "source": {"sha1": "a10a6d0387d30687e5593623f9c13baa99c608d9", "sha256": "3ca5eea278f081b2448505f9b44764588a224af3365552cfa28e05d8398a4c05", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M12/coursier_2.11-1.1.0-M12-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M13", "lang": "scala", "sha1": "d44b8bcf609a3b898fcc005417cb5c8871a9b45d", "sha256": "69b38cd357feceb929f5fde4c149b1c03ef83dbd172566e669a1f5e9d229b90b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M13/coursier-cache_2.11-1.1.0-M13.jar", "source": {"sha1": "b644c92827a7c8dec6180070aba30bc820c72d75", "sha256": "6abae35892a07351763c7d09b2ebf1eb3bb2f55bd57fefa66f0920afe2f1b282", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M13/coursier-cache_2.11-1.1.0-M13-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M13", "lang": "scala", "sha1": "764e4154bbf27f25b2f40d7f5b6cdbcf26403a78", "sha256": "8780c1777bf7357c3fcaf1fad880a26fa8347444cfc8390c2860c7fff637e866", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M13/coursier-core_2.11-1.1.0-M13.jar", "source": {"sha1": "62ace6de0654306f91190f56fe896e465f8c4fb6", "sha256": "b0be8bdb44e1ebed06072451a0c5e6c9b344bbe32f4b8c3173bf49e8bc166e87", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M13/coursier-core_2.11-1.1.0-M13-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M13", "lang": "scala", "sha1": "f4a285c31abed5195810492d09ab387deb98947a", "sha256": "5c7bdeb2939badc824e956871caa42f7832b2cf00025ba7d1ff04dd55098c5f4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M13/coursier_2.11-1.1.0-M13.jar", "source": {"sha1": "f136bf0c365fe79a61ce823674b07ead9c1ae44b", "sha256": "b13e24f3be8c0f461165d03de1248f0aa049d432f8274eed834fdcc7615aabe1", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M13/coursier_2.11-1.1.0-M13-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index 03d0d953..f35783b1 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core", ""]
-      version: "1.1.0-M12"
+      version: "1.1.0-M13"
 
   org.apache.maven:
     maven:

From ddd82792112938520251ff5459d12779b11aea53 Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:43:35 -0600
Subject: [PATCH 07/18] cp

---
 3rdparty/workspace.bzl | 6 +++---
 dependencies.yaml      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index 63a3d0af..64e289b8 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -92,9 +92,9 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M13", "lang": "scala", "sha1": "d44b8bcf609a3b898fcc005417cb5c8871a9b45d", "sha256": "69b38cd357feceb929f5fde4c149b1c03ef83dbd172566e669a1f5e9d229b90b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M13/coursier-cache_2.11-1.1.0-M13.jar", "source": {"sha1": "b644c92827a7c8dec6180070aba30bc820c72d75", "sha256": "6abae35892a07351763c7d09b2ebf1eb3bb2f55bd57fefa66f0920afe2f1b282", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M13/coursier-cache_2.11-1.1.0-M13-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M13", "lang": "scala", "sha1": "764e4154bbf27f25b2f40d7f5b6cdbcf26403a78", "sha256": "8780c1777bf7357c3fcaf1fad880a26fa8347444cfc8390c2860c7fff637e866", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M13/coursier-core_2.11-1.1.0-M13.jar", "source": {"sha1": "62ace6de0654306f91190f56fe896e465f8c4fb6", "sha256": "b0be8bdb44e1ebed06072451a0c5e6c9b344bbe32f4b8c3173bf49e8bc166e87", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M13/coursier-core_2.11-1.1.0-M13-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M13", "lang": "scala", "sha1": "f4a285c31abed5195810492d09ab387deb98947a", "sha256": "5c7bdeb2939badc824e956871caa42f7832b2cf00025ba7d1ff04dd55098c5f4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M13/coursier_2.11-1.1.0-M13.jar", "source": {"sha1": "f136bf0c365fe79a61ce823674b07ead9c1ae44b", "sha256": "b13e24f3be8c0f461165d03de1248f0aa049d432f8274eed834fdcc7615aabe1", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M13/coursier_2.11-1.1.0-M13-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M13-2", "lang": "scala", "sha1": "836c2cd5bbb0686e2afee14973e350e587b8354c", "sha256": "e87fcf051eb286abee3bf647653b36b85f552a214488b3eaa8a691c87a38c2bc", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M13-2/coursier-cache_2.11-1.1.0-M13-2.jar", "source": {"sha1": "5c9c4d8f6b3c66b053aa9615678b6881fb9555d3", "sha256": "a5beb2f2d99f0ad431502309c14c0217c91b7b9153d95ab7717ac415d5e0703d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M13-2/coursier-cache_2.11-1.1.0-M13-2-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M13-2", "lang": "scala", "sha1": "f427e8f54b7e36021d8f02d62af69c82c80b7986", "sha256": "9cdd01192a639f5363e8dcb8f046322f756b73e1826e420aa2b325f26a11cfc4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M13-2/coursier-core_2.11-1.1.0-M13-2.jar", "source": {"sha1": "683e14d235fc316d0893f3bdf99bf58914c47dac", "sha256": "f4dee120388933f2c5ce28b1d871f61481fca0784a79dd91c17171d7e07220d0", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M13-2/coursier-core_2.11-1.1.0-M13-2-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M13-2", "lang": "scala", "sha1": "4519571036e5d0fbac9651f10266332046a1e09b", "sha256": "0daa868ea2f56afbf7933fb487fd6b5b9f080cae41d773348dae2eeeba78c098", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M13-2/coursier_2.11-1.1.0-M13-2.jar", "source": {"sha1": "3a355d1b21de89da22cbcab4267c18fda8619aa3", "sha256": "715186c1d6794bdc2782fbb8fae148d158112bb97d8a0c77d94b1fcf2d8a8dc4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M13-2/coursier_2.11-1.1.0-M13-2-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index f35783b1..d2a1e16e 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core", ""]
-      version: "1.1.0-M13"
+      version: "1.1.0-M13-2"
 
   org.apache.maven:
     maven:

From 26117cf70cd57426c05ccb24ebb1cca0aae03fc7 Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:44:57 -0600
Subject: [PATCH 08/18] cp

---
 3rdparty/jvm/io/get_coursier/BUILD                        | 1 +
 3rdparty/workspace.bzl                                    | 8 +++++---
 dependencies.yaml                                         | 2 +-
 .../com/github/johnynek/bazel_deps/CoursierResolver.scala | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/3rdparty/jvm/io/get_coursier/BUILD b/3rdparty/jvm/io/get_coursier/BUILD
index c24d94cf..16efddd5 100644
--- a/3rdparty/jvm/io/get_coursier/BUILD
+++ b/3rdparty/jvm/io/get_coursier/BUILD
@@ -6,6 +6,7 @@ scala_import(
         "//external:jar/io/get_coursier/coursier_2_11"
     ],
     runtime_deps = [
+        "//3rdparty/jvm/com/github/alexarchambault:argonaut_shapeless_6_2",
         "//3rdparty/jvm/org/scala_lang:scala_library",
         ":coursier_cache",
         ":coursier_core"
diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index 64e289b8..da3175c0 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -80,9 +80,11 @@ def list_dependencies():
 # - io.circe:circe-jackson25_2.11:0.9.0 wanted version 2.5.5
     {"artifact": "com.fasterxml.jackson.core:jackson-databind:2.5.5", "lang": "java", "sha1": "b08c3194166a230e60f56ac98bcd5cab5ee39d65", "sha256": "7733bd2a60158e448a21e4ee4578739e57a128d816410e75e3099b1494b8e58c", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.5.5/jackson-databind-2.5.5.jar", "source": {"sha1": "18480db6c085b9227ef693fb3e96ce7853c9984b", "sha256": "5ec33d76107f03f1ccdee713bd688951c614ce8dfa59662fd112684732cd9757", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.5.5/jackson-databind-2.5.5-sources.jar"} , "name": "com_fasterxml_jackson_core_jackson_databind", "actual": "@com_fasterxml_jackson_core_jackson_databind//jar", "bind": "jar/com/fasterxml/jackson/core/jackson_databind"},
     {"artifact": "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.5.3", "lang": "java", "sha1": "8fc7e5a9911c3ab4b0dd7e74f12621681835e3fc", "sha256": "fb37d4f86680af414742ccd56a897aedea678403b5eadb2f0990b687486e4be0", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.5.3/jackson-dataformat-yaml-2.5.3.jar", "source": {"sha1": "173db98f9d13cb2395d0e038dad47d79b21c6fe4", "sha256": "aa6be194db8a6740620039e8ea2f5078d97b8b5db2a42fcbd4736bc242b7ed8b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.5.3/jackson-dataformat-yaml-2.5.3-sources.jar"} , "name": "com_fasterxml_jackson_dataformat_jackson_dataformat_yaml", "actual": "@com_fasterxml_jackson_dataformat_jackson_dataformat_yaml//jar", "bind": "jar/com/fasterxml/jackson/dataformat/jackson_dataformat_yaml"},
+    {"artifact": "com.github.alexarchambault:argonaut-shapeless_6.2_2.11:1.2.0-M10", "lang": "scala", "sha1": "62599a77d1e9f122309b0e62d08f8fc7519d557c", "sha256": "c0cc8166dccad1ec4d8c7533179d4f0d5696e7b5fc8f01d3b209781f252baf73", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/github/alexarchambault/argonaut-shapeless_6.2_2.11/1.2.0-M10/argonaut-shapeless_6.2_2.11-1.2.0-M10.jar", "source": {"sha1": "b69df8b89ee5d7572445e46581c58045ad3c899d", "sha256": "a690c1d7504851d734be27793308cb5e651f5f9601385804a0dd2df73a9e68b0", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/github/alexarchambault/argonaut-shapeless_6.2_2.11/1.2.0-M10/argonaut-shapeless_6.2_2.11-1.2.0-M10-sources.jar"} , "name": "com_github_alexarchambault_argonaut_shapeless_6_2_2_11", "actual": "@com_github_alexarchambault_argonaut_shapeless_6_2_2_11//jar:file", "bind": "jar/com/github/alexarchambault/argonaut_shapeless_6_2_2_11"},
     {"artifact": "com.google.guava:guava:18.0", "lang": "java", "sha1": "cce0823396aa693798f8882e64213b1772032b09", "sha256": "d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/google/guava/guava/18.0/guava-18.0.jar", "source": {"sha1": "ad97fe8faaf01a3d3faacecd58e8fa6e78a973ca", "sha256": "0f3381ce4caa3a01602cdf0d0f4437b9ad8f347ddabbd873ded4d498e19d9590", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/google/guava/guava/18.0/guava-18.0-sources.jar"} , "name": "com_google_guava_guava", "actual": "@com_google_guava_guava//jar", "bind": "jar/com/google/guava/guava"},
     {"artifact": "com.monovore:decline_2.11:0.4.2", "lang": "scala", "sha1": "6ba2ad6bb271bfe1df1a1ada1725a262d0cad437", "sha256": "c3c732cf50b616d7c23b1410ab605c33a630a4daf36ce9882b665b4e6d6ea361", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/monovore/decline_2.11/0.4.2/decline_2.11-0.4.2.jar", "source": {"sha1": "6859ade0f9d3a293086765bca0440ce01ade0280", "sha256": "bbab8cc31cd043c0cd77d96cfa8894c7609cdadf4913901c9dd7746ccd37edc6", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/monovore/decline_2.11/0.4.2/decline_2.11-0.4.2-sources.jar"} , "name": "com_monovore_decline_2_11", "actual": "@com_monovore_decline_2_11//jar:file", "bind": "jar/com/monovore/decline_2_11"},
     {"artifact": "commons-codec:commons-codec:1.6", "lang": "java", "sha1": "b7f0fc8f61ecadeb3695f0b9464755eee44374d4", "sha256": "54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.6/commons-codec-1.6.jar", "source": {"sha1": "61e9f9d11fe3e12ec62f633006e99d75fd7f19c8", "sha256": "cff6a3db12b91f0fa3484d928d7863f162b0ae2789eaa3fb21604f2487611558", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.6/commons-codec-1.6-sources.jar"} , "name": "commons_codec_commons_codec", "actual": "@commons_codec_commons_codec//jar", "bind": "jar/commons_codec/commons_codec"},
+    {"artifact": "io.argonaut:argonaut_2.11:6.2.3", "lang": "scala", "sha1": "eef0bd6225b0a901a1937bb529d4b31bdb375a9e", "sha256": "94d0e1f4963e96f99cf81d2e458df3e39dadebdf3140a8a6fc87df8a47bf86c8", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/argonaut/argonaut_2.11/6.2.3/argonaut_2.11-6.2.3.jar", "source": {"sha1": "9d5a3b78645b6e04b129ee79129e5a04b00c2568", "sha256": "fef7bf268306b8680eca586b9a00a1ab8ef1bb238a42d0c6e32975495016a390", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/argonaut/argonaut_2.11/6.2.3/argonaut_2.11-6.2.3-sources.jar"} , "name": "io_argonaut_argonaut_2_11", "actual": "@io_argonaut_argonaut_2_11//jar:file", "bind": "jar/io/argonaut/argonaut_2_11"},
 # duplicates in io.circe:circe-core_2.11 fixed to 0.9.3
 # - io.circe:circe-generic_2.11:0.9.3 wanted version 0.9.3
 # - io.circe:circe-jackson25_2.11:0.9.0 wanted version 0.9.0
@@ -92,9 +94,9 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M13-2", "lang": "scala", "sha1": "836c2cd5bbb0686e2afee14973e350e587b8354c", "sha256": "e87fcf051eb286abee3bf647653b36b85f552a214488b3eaa8a691c87a38c2bc", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M13-2/coursier-cache_2.11-1.1.0-M13-2.jar", "source": {"sha1": "5c9c4d8f6b3c66b053aa9615678b6881fb9555d3", "sha256": "a5beb2f2d99f0ad431502309c14c0217c91b7b9153d95ab7717ac415d5e0703d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M13-2/coursier-cache_2.11-1.1.0-M13-2-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M13-2", "lang": "scala", "sha1": "f427e8f54b7e36021d8f02d62af69c82c80b7986", "sha256": "9cdd01192a639f5363e8dcb8f046322f756b73e1826e420aa2b325f26a11cfc4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M13-2/coursier-core_2.11-1.1.0-M13-2.jar", "source": {"sha1": "683e14d235fc316d0893f3bdf99bf58914c47dac", "sha256": "f4dee120388933f2c5ce28b1d871f61481fca0784a79dd91c17171d7e07220d0", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M13-2/coursier-core_2.11-1.1.0-M13-2-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M13-2", "lang": "scala", "sha1": "4519571036e5d0fbac9651f10266332046a1e09b", "sha256": "0daa868ea2f56afbf7933fb487fd6b5b9f080cae41d773348dae2eeeba78c098", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M13-2/coursier_2.11-1.1.0-M13-2.jar", "source": {"sha1": "3a355d1b21de89da22cbcab4267c18fda8619aa3", "sha256": "715186c1d6794bdc2782fbb8fae148d158112bb97d8a0c77d94b1fcf2d8a8dc4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M13-2/coursier_2.11-1.1.0-M13-2-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M14", "lang": "scala", "sha1": "295d9fdaac979d166633574e418254e051a4925d", "sha256": "acffcbae86de1a38c345abeb57af5fd37961f8bf9ec0e23305c48d6ee67f3dde", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M14/coursier-cache_2.11-1.1.0-M14.jar", "source": {"sha1": "d4881b3ffda88144501ac9d5af415a07d18e4e6e", "sha256": "01325a2dd009e9398c42d9f6f744939f5085ce283d204e2e9a034872968c11b0", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M14/coursier-cache_2.11-1.1.0-M14-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M14", "lang": "scala", "sha1": "158650d5c44921d2dbcc6880860c2b97cdb1c921", "sha256": "490b33d949e927a71679a125a79084628d3e1bca8ddb81390ee854ec35decd79", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M14/coursier-core_2.11-1.1.0-M14.jar", "source": {"sha1": "ae099ce534f2f3bfbc57c37bcc29d293c62db6e5", "sha256": "68bfcd6b5d9a6e2fcf01e93607f19b37ab4f04c543d3491854f824659a8ab85b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M14/coursier-core_2.11-1.1.0-M14-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M14", "lang": "scala", "sha1": "2daa050207187753dfe130c0624e4fffae8fcd1e", "sha256": "01f18d54b927eb3040ea3f23c7e928b588d21ed6c00f0b2220eab1ca0f2eca2e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M14/coursier_2.11-1.1.0-M14.jar", "source": {"sha1": "6381ae0942ab8473a650b26680fa78c8eebb87e2", "sha256": "d8d4da5c65beec20ea978e36f3d3d4a9948d7b92e7bd24d2fc49afeac9062885", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M14/coursier_2.11-1.1.0-M14-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index d2a1e16e..b9557a5f 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core", ""]
-      version: "1.1.0-M13-2"
+      version: "1.1.0-M14"
 
   org.apache.maven:
     maven:
diff --git a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
index afc63e39..862778d9 100644
--- a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
+++ b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
@@ -6,7 +6,7 @@ import coursier.util.Task
 import cats.MonadError
 import cats.data.{Nested, NonEmptyList, Validated, ValidatedNel}
 import cats.implicits._
-import coursier.cache.LocalRepositories
+import coursier.LocalRepositories
 import coursier.core._
 import org.slf4j.LoggerFactory
 

From 4e0448a4b51463b215a226affbe44917eb0ad723 Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:45:35 -0600
Subject: [PATCH 09/18] cp

---
 3rdparty/jvm/com/github/alexarchambault/BUILD | 18 ++++++++++++++++++
 3rdparty/jvm/io/argonaut/BUILD                | 16 ++++++++++++++++
 3rdparty/workspace.bzl                        |  8 ++++----
 dependencies.yaml                             |  2 +-
 4 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 3rdparty/jvm/com/github/alexarchambault/BUILD
 create mode 100644 3rdparty/jvm/io/argonaut/BUILD

diff --git a/3rdparty/jvm/com/github/alexarchambault/BUILD b/3rdparty/jvm/com/github/alexarchambault/BUILD
new file mode 100644
index 00000000..f9e7e83e
--- /dev/null
+++ b/3rdparty/jvm/com/github/alexarchambault/BUILD
@@ -0,0 +1,18 @@
+load("@io_bazel_rules_scala//scala:scala_import.bzl", "scala_import")
+load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
+scala_import(
+    name = "argonaut_shapeless_6_2",
+    jars = [
+        "//external:jar/com/github/alexarchambault/argonaut_shapeless_6_2_2_11"
+    ],
+    runtime_deps = [
+        "//3rdparty/jvm/com/chuusai:shapeless",
+        "//3rdparty/jvm/io/argonaut:argonaut",
+        "//3rdparty/jvm/org/scala_lang:scala_library"
+    ],
+    visibility = [
+        "//3rdparty/jvm:__subpackages__"
+    ]
+)
+
+
diff --git a/3rdparty/jvm/io/argonaut/BUILD b/3rdparty/jvm/io/argonaut/BUILD
new file mode 100644
index 00000000..73aa3aa8
--- /dev/null
+++ b/3rdparty/jvm/io/argonaut/BUILD
@@ -0,0 +1,16 @@
+load("@io_bazel_rules_scala//scala:scala_import.bzl", "scala_import")
+load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
+scala_import(
+    name = "argonaut",
+    jars = [
+        "//external:jar/io/argonaut/argonaut_2_11"
+    ],
+    runtime_deps = [
+        "//3rdparty/jvm/org/scala_lang:scala_reflect"
+    ],
+    visibility = [
+        "//3rdparty/jvm:__subpackages__"
+    ]
+)
+
+
diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index da3175c0..b3e1aa10 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -80,7 +80,7 @@ def list_dependencies():
 # - io.circe:circe-jackson25_2.11:0.9.0 wanted version 2.5.5
     {"artifact": "com.fasterxml.jackson.core:jackson-databind:2.5.5", "lang": "java", "sha1": "b08c3194166a230e60f56ac98bcd5cab5ee39d65", "sha256": "7733bd2a60158e448a21e4ee4578739e57a128d816410e75e3099b1494b8e58c", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.5.5/jackson-databind-2.5.5.jar", "source": {"sha1": "18480db6c085b9227ef693fb3e96ce7853c9984b", "sha256": "5ec33d76107f03f1ccdee713bd688951c614ce8dfa59662fd112684732cd9757", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.5.5/jackson-databind-2.5.5-sources.jar"} , "name": "com_fasterxml_jackson_core_jackson_databind", "actual": "@com_fasterxml_jackson_core_jackson_databind//jar", "bind": "jar/com/fasterxml/jackson/core/jackson_databind"},
     {"artifact": "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.5.3", "lang": "java", "sha1": "8fc7e5a9911c3ab4b0dd7e74f12621681835e3fc", "sha256": "fb37d4f86680af414742ccd56a897aedea678403b5eadb2f0990b687486e4be0", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.5.3/jackson-dataformat-yaml-2.5.3.jar", "source": {"sha1": "173db98f9d13cb2395d0e038dad47d79b21c6fe4", "sha256": "aa6be194db8a6740620039e8ea2f5078d97b8b5db2a42fcbd4736bc242b7ed8b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.5.3/jackson-dataformat-yaml-2.5.3-sources.jar"} , "name": "com_fasterxml_jackson_dataformat_jackson_dataformat_yaml", "actual": "@com_fasterxml_jackson_dataformat_jackson_dataformat_yaml//jar", "bind": "jar/com/fasterxml/jackson/dataformat/jackson_dataformat_yaml"},
-    {"artifact": "com.github.alexarchambault:argonaut-shapeless_6.2_2.11:1.2.0-M10", "lang": "scala", "sha1": "62599a77d1e9f122309b0e62d08f8fc7519d557c", "sha256": "c0cc8166dccad1ec4d8c7533179d4f0d5696e7b5fc8f01d3b209781f252baf73", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/github/alexarchambault/argonaut-shapeless_6.2_2.11/1.2.0-M10/argonaut-shapeless_6.2_2.11-1.2.0-M10.jar", "source": {"sha1": "b69df8b89ee5d7572445e46581c58045ad3c899d", "sha256": "a690c1d7504851d734be27793308cb5e651f5f9601385804a0dd2df73a9e68b0", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/github/alexarchambault/argonaut-shapeless_6.2_2.11/1.2.0-M10/argonaut-shapeless_6.2_2.11-1.2.0-M10-sources.jar"} , "name": "com_github_alexarchambault_argonaut_shapeless_6_2_2_11", "actual": "@com_github_alexarchambault_argonaut_shapeless_6_2_2_11//jar:file", "bind": "jar/com/github/alexarchambault/argonaut_shapeless_6_2_2_11"},
+    {"artifact": "com.github.alexarchambault:argonaut-shapeless_6.2_2.11:1.2.0-M11", "lang": "scala", "sha1": "1a4b6680f12516384dd19498d3064e04afd5a276", "sha256": "bd527b2e9248c2d857dc43444f6a00fdefddcac42df8d430a247fd6a7d643cd3", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/github/alexarchambault/argonaut-shapeless_6.2_2.11/1.2.0-M11/argonaut-shapeless_6.2_2.11-1.2.0-M11.jar", "source": {"sha1": "d6ad3ba9c73ac15ea9f4992e207bbc136547cb19", "sha256": "cb426bdc2df8afa7d0401a7e871ad12663573ad027be26798ed1cc10f6b908fd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/github/alexarchambault/argonaut-shapeless_6.2_2.11/1.2.0-M11/argonaut-shapeless_6.2_2.11-1.2.0-M11-sources.jar"} , "name": "com_github_alexarchambault_argonaut_shapeless_6_2_2_11", "actual": "@com_github_alexarchambault_argonaut_shapeless_6_2_2_11//jar:file", "bind": "jar/com/github/alexarchambault/argonaut_shapeless_6_2_2_11"},
     {"artifact": "com.google.guava:guava:18.0", "lang": "java", "sha1": "cce0823396aa693798f8882e64213b1772032b09", "sha256": "d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/google/guava/guava/18.0/guava-18.0.jar", "source": {"sha1": "ad97fe8faaf01a3d3faacecd58e8fa6e78a973ca", "sha256": "0f3381ce4caa3a01602cdf0d0f4437b9ad8f347ddabbd873ded4d498e19d9590", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/google/guava/guava/18.0/guava-18.0-sources.jar"} , "name": "com_google_guava_guava", "actual": "@com_google_guava_guava//jar", "bind": "jar/com/google/guava/guava"},
     {"artifact": "com.monovore:decline_2.11:0.4.2", "lang": "scala", "sha1": "6ba2ad6bb271bfe1df1a1ada1725a262d0cad437", "sha256": "c3c732cf50b616d7c23b1410ab605c33a630a4daf36ce9882b665b4e6d6ea361", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/monovore/decline_2.11/0.4.2/decline_2.11-0.4.2.jar", "source": {"sha1": "6859ade0f9d3a293086765bca0440ce01ade0280", "sha256": "bbab8cc31cd043c0cd77d96cfa8894c7609cdadf4913901c9dd7746ccd37edc6", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/com/monovore/decline_2.11/0.4.2/decline_2.11-0.4.2-sources.jar"} , "name": "com_monovore_decline_2_11", "actual": "@com_monovore_decline_2_11//jar:file", "bind": "jar/com/monovore/decline_2_11"},
     {"artifact": "commons-codec:commons-codec:1.6", "lang": "java", "sha1": "b7f0fc8f61ecadeb3695f0b9464755eee44374d4", "sha256": "54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.6/commons-codec-1.6.jar", "source": {"sha1": "61e9f9d11fe3e12ec62f633006e99d75fd7f19c8", "sha256": "cff6a3db12b91f0fa3484d928d7863f162b0ae2789eaa3fb21604f2487611558", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.6/commons-codec-1.6-sources.jar"} , "name": "commons_codec_commons_codec", "actual": "@commons_codec_commons_codec//jar", "bind": "jar/commons_codec/commons_codec"},
@@ -94,9 +94,9 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M14", "lang": "scala", "sha1": "295d9fdaac979d166633574e418254e051a4925d", "sha256": "acffcbae86de1a38c345abeb57af5fd37961f8bf9ec0e23305c48d6ee67f3dde", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M14/coursier-cache_2.11-1.1.0-M14.jar", "source": {"sha1": "d4881b3ffda88144501ac9d5af415a07d18e4e6e", "sha256": "01325a2dd009e9398c42d9f6f744939f5085ce283d204e2e9a034872968c11b0", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M14/coursier-cache_2.11-1.1.0-M14-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M14", "lang": "scala", "sha1": "158650d5c44921d2dbcc6880860c2b97cdb1c921", "sha256": "490b33d949e927a71679a125a79084628d3e1bca8ddb81390ee854ec35decd79", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M14/coursier-core_2.11-1.1.0-M14.jar", "source": {"sha1": "ae099ce534f2f3bfbc57c37bcc29d293c62db6e5", "sha256": "68bfcd6b5d9a6e2fcf01e93607f19b37ab4f04c543d3491854f824659a8ab85b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M14/coursier-core_2.11-1.1.0-M14-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M14", "lang": "scala", "sha1": "2daa050207187753dfe130c0624e4fffae8fcd1e", "sha256": "01f18d54b927eb3040ea3f23c7e928b588d21ed6c00f0b2220eab1ca0f2eca2e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M14/coursier_2.11-1.1.0-M14.jar", "source": {"sha1": "6381ae0942ab8473a650b26680fa78c8eebb87e2", "sha256": "d8d4da5c65beec20ea978e36f3d3d4a9948d7b92e7bd24d2fc49afeac9062885", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M14/coursier_2.11-1.1.0-M14-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M14-4", "lang": "scala", "sha1": "2ab84e8948fc4674cd990ad036ec102f41b6290a", "sha256": "68557d4adb9839ba978c395ef8182344f7c342af4514f4673d14b384f37f504c", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M14-4/coursier-cache_2.11-1.1.0-M14-4.jar", "source": {"sha1": "988a09c5036606b221cb10160e5a6f0dc20acb10", "sha256": "d944c34ed7b0818418880cbc9fcd9928f7797792a0c444897b87ce36d3e67347", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M14-4/coursier-cache_2.11-1.1.0-M14-4-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M14-4", "lang": "scala", "sha1": "333cac79befeb7650c62fc6fde90c79fe9d57df0", "sha256": "c9fe018478e6566c1e14fcb5fa72d364a1a04455ad298e9956c151e984dafb2f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M14-4/coursier-core_2.11-1.1.0-M14-4.jar", "source": {"sha1": "a5cee7a9fe19b251bb698bc7f85303fea78d1cdd", "sha256": "c717455023bb4586636acf80d424a92fd98717cfad43a8341eeafb378f66e220", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M14-4/coursier-core_2.11-1.1.0-M14-4-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M14-4", "lang": "scala", "sha1": "772b3832f0d223eb2d1e3ffc6499c83aa20bd74d", "sha256": "cfc614b70a1ead3e92fb614d07bb5b0c688b0dd53a3c14ef6a059f8ddeaf2edb", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M14-4/coursier_2.11-1.1.0-M14-4.jar", "source": {"sha1": "ecca457ad1dec80f419ea3d1bf5e5b2463e32c29", "sha256": "b325dfe9dc7be375f95351c935b98110344387d1cb2ded4c7dbdcf497121bb14", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M14-4/coursier_2.11-1.1.0-M14-4-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index b9557a5f..51f2e8a4 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core", ""]
-      version: "1.1.0-M14"
+      version: "1.1.0-M14-4"
 
   org.apache.maven:
     maven:

From 0c06679b530bebc3fe999205bd211c34b03b4f90 Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:46:32 -0600
Subject: [PATCH 10/18] Up to M14

---
 3rdparty/workspace.bzl | 6 +++---
 dependencies.yaml      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index b3e1aa10..83e8bee6 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -94,9 +94,9 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M14-4", "lang": "scala", "sha1": "2ab84e8948fc4674cd990ad036ec102f41b6290a", "sha256": "68557d4adb9839ba978c395ef8182344f7c342af4514f4673d14b384f37f504c", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M14-4/coursier-cache_2.11-1.1.0-M14-4.jar", "source": {"sha1": "988a09c5036606b221cb10160e5a6f0dc20acb10", "sha256": "d944c34ed7b0818418880cbc9fcd9928f7797792a0c444897b87ce36d3e67347", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M14-4/coursier-cache_2.11-1.1.0-M14-4-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M14-4", "lang": "scala", "sha1": "333cac79befeb7650c62fc6fde90c79fe9d57df0", "sha256": "c9fe018478e6566c1e14fcb5fa72d364a1a04455ad298e9956c151e984dafb2f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M14-4/coursier-core_2.11-1.1.0-M14-4.jar", "source": {"sha1": "a5cee7a9fe19b251bb698bc7f85303fea78d1cdd", "sha256": "c717455023bb4586636acf80d424a92fd98717cfad43a8341eeafb378f66e220", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M14-4/coursier-core_2.11-1.1.0-M14-4-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M14-4", "lang": "scala", "sha1": "772b3832f0d223eb2d1e3ffc6499c83aa20bd74d", "sha256": "cfc614b70a1ead3e92fb614d07bb5b0c688b0dd53a3c14ef6a059f8ddeaf2edb", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M14-4/coursier_2.11-1.1.0-M14-4.jar", "source": {"sha1": "ecca457ad1dec80f419ea3d1bf5e5b2463e32c29", "sha256": "b325dfe9dc7be375f95351c935b98110344387d1cb2ded4c7dbdcf497121bb14", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M14-4/coursier_2.11-1.1.0-M14-4-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M14-7", "lang": "scala", "sha1": "76e7c13441c9cd247958e37bf2c34795e52abe5b", "sha256": "992e1db45e74b76b16ea06ea9aedf120acf09d647c30cfd9af3571e31ec5a8b5", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M14-7/coursier-cache_2.11-1.1.0-M14-7.jar", "source": {"sha1": "4b23c22afabd0359aa9a0392a6264320fbf3be0a", "sha256": "8b0e3601f4ed7d94146541e8492a3184bda716833e5ed2947131ac7bb7422e7f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M14-7/coursier-cache_2.11-1.1.0-M14-7-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M14-7", "lang": "scala", "sha1": "c26ce82909127e007d6c56c4ec09120546cf3d91", "sha256": "2a9e0e966ed4ab293e734a4aac45fc6c3c34318b979216691c4ce9dc869c9d98", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M14-7/coursier-core_2.11-1.1.0-M14-7.jar", "source": {"sha1": "717c29cf8aba09b0f867bdc59d5ba6e78b22f945", "sha256": "f74de2846fde27555437704dda72d14f6620ede11d27ed95913e0b2ff19bc5d2", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M14-7/coursier-core_2.11-1.1.0-M14-7-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M14-7", "lang": "scala", "sha1": "bd7d19c0bff373cbcb8651cf2f945e486a4c26ae", "sha256": "c1ca716e0e9c45be01b6c031f2f0c5f0e0a485217e5559e24707a0c3749225f7", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M14-7/coursier_2.11-1.1.0-M14-7.jar", "source": {"sha1": "f25447b3db8e1dcca4f35eff737ee9240354a054", "sha256": "78621db4209ef9ca966ddeebd3d4a94140c570e090ebdee9874280ae6a17c518", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M14-7/coursier_2.11-1.1.0-M14-7-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index 51f2e8a4..7442d097 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core", ""]
-      version: "1.1.0-M14-4"
+      version: "1.1.0-M14-7"
 
   org.apache.maven:
     maven:

From 694b46fe83bf7a6af748b262c03b9ebdb8814108 Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:47:22 -0600
Subject: [PATCH 11/18] cp

---
 3rdparty/workspace.bzl | 6 +++---
 dependencies.yaml      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index 83e8bee6..d8c29e7a 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -94,9 +94,9 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:1.1.0-M14-7", "lang": "scala", "sha1": "76e7c13441c9cd247958e37bf2c34795e52abe5b", "sha256": "992e1db45e74b76b16ea06ea9aedf120acf09d647c30cfd9af3571e31ec5a8b5", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M14-7/coursier-cache_2.11-1.1.0-M14-7.jar", "source": {"sha1": "4b23c22afabd0359aa9a0392a6264320fbf3be0a", "sha256": "8b0e3601f4ed7d94146541e8492a3184bda716833e5ed2947131ac7bb7422e7f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/1.1.0-M14-7/coursier-cache_2.11-1.1.0-M14-7-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:1.1.0-M14-7", "lang": "scala", "sha1": "c26ce82909127e007d6c56c4ec09120546cf3d91", "sha256": "2a9e0e966ed4ab293e734a4aac45fc6c3c34318b979216691c4ce9dc869c9d98", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M14-7/coursier-core_2.11-1.1.0-M14-7.jar", "source": {"sha1": "717c29cf8aba09b0f867bdc59d5ba6e78b22f945", "sha256": "f74de2846fde27555437704dda72d14f6620ede11d27ed95913e0b2ff19bc5d2", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/1.1.0-M14-7/coursier-core_2.11-1.1.0-M14-7-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:1.1.0-M14-7", "lang": "scala", "sha1": "bd7d19c0bff373cbcb8651cf2f945e486a4c26ae", "sha256": "c1ca716e0e9c45be01b6c031f2f0c5f0e0a485217e5559e24707a0c3749225f7", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M14-7/coursier_2.11-1.1.0-M14-7.jar", "source": {"sha1": "f25447b3db8e1dcca4f35eff737ee9240354a054", "sha256": "78621db4209ef9ca966ddeebd3d4a94140c570e090ebdee9874280ae6a17c518", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/1.1.0-M14-7/coursier_2.11-1.1.0-M14-7-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC1", "lang": "scala", "sha1": "b436a758a9c8d39db8c871938f443ce276022487", "sha256": "5ddce488aabc42f38afddb7e5583600594f390c7e6c33f7f6b2c7737f6b05c9f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC1/coursier-cache_2.11-2.0.0-RC1.jar", "source": {"sha1": "c8a507a9ee6ab43530b8bb63f7e8cd7c92627949", "sha256": "50126cbc37f968242416af4c4fa092aa2cd3742df8ef57ea2ec2ef7b793c1ee4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC1/coursier-cache_2.11-2.0.0-RC1-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC1", "lang": "scala", "sha1": "ea6b330d798a6523642c35e8bca4660e7b9f1de3", "sha256": "a85b8709fec81c119e0036b2ebba26bd99548eecc37daaa2d542e44ff1741326", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC1/coursier-core_2.11-2.0.0-RC1.jar", "source": {"sha1": "de4a54b64a331a5631d4f97718e7af9dee313f1d", "sha256": "7260ff2cb11e1686b8623298081bcaabf2117a8748eee49639f75e664972f6a1", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC1/coursier-core_2.11-2.0.0-RC1-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC1", "lang": "scala", "sha1": "12511323c767a965cb4d389e98562ee8df727723", "sha256": "3a11f1abc7cde3f26c11e27359bd15d60fb2d766bfd4ba6152dfa4bfed82c84d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC1/coursier_2.11-2.0.0-RC1.jar", "source": {"sha1": "32109b7cb1edf50aa04c44e63d2753ca43d6f14f", "sha256": "45f48b80fa63e47fc2db1bf568d0338c1019192cfdf4124e4ed4a09b6faec25f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC1/coursier_2.11-2.0.0-RC1-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index 7442d097..ff77d4c3 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core", ""]
-      version: "1.1.0-M14-7"
+      version: "2.0.0-RC1"
 
   org.apache.maven:
     maven:

From f5ed266a51133b456d738c6501a78f555b355aae Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:47:58 -0600
Subject: [PATCH 12/18] Cp

---
 3rdparty/workspace.bzl | 6 +++---
 dependencies.yaml      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index d8c29e7a..eefa1545 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -94,9 +94,9 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC1", "lang": "scala", "sha1": "b436a758a9c8d39db8c871938f443ce276022487", "sha256": "5ddce488aabc42f38afddb7e5583600594f390c7e6c33f7f6b2c7737f6b05c9f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC1/coursier-cache_2.11-2.0.0-RC1.jar", "source": {"sha1": "c8a507a9ee6ab43530b8bb63f7e8cd7c92627949", "sha256": "50126cbc37f968242416af4c4fa092aa2cd3742df8ef57ea2ec2ef7b793c1ee4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC1/coursier-cache_2.11-2.0.0-RC1-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC1", "lang": "scala", "sha1": "ea6b330d798a6523642c35e8bca4660e7b9f1de3", "sha256": "a85b8709fec81c119e0036b2ebba26bd99548eecc37daaa2d542e44ff1741326", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC1/coursier-core_2.11-2.0.0-RC1.jar", "source": {"sha1": "de4a54b64a331a5631d4f97718e7af9dee313f1d", "sha256": "7260ff2cb11e1686b8623298081bcaabf2117a8748eee49639f75e664972f6a1", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC1/coursier-core_2.11-2.0.0-RC1-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC1", "lang": "scala", "sha1": "12511323c767a965cb4d389e98562ee8df727723", "sha256": "3a11f1abc7cde3f26c11e27359bd15d60fb2d766bfd4ba6152dfa4bfed82c84d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC1/coursier_2.11-2.0.0-RC1.jar", "source": {"sha1": "32109b7cb1edf50aa04c44e63d2753ca43d6f14f", "sha256": "45f48b80fa63e47fc2db1bf568d0338c1019192cfdf4124e4ed4a09b6faec25f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC1/coursier_2.11-2.0.0-RC1-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC2-2", "lang": "scala", "sha1": "8e0a649a1e1e5234a1b0a3e2a81a2d653f82c029", "sha256": "9bf7b366ff81e994a0e63bc3d61401de5d6d5e2fd5d3ff541730737ea0e27be7", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC2-2/coursier-cache_2.11-2.0.0-RC2-2.jar", "source": {"sha1": "127062550eb6832ed0d897c87f75fa419fd64ed2", "sha256": "76c02de53781253c8af6a24d33874958fedfe5d0aaa2f9094c4972a3ddfcc9ca", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC2-2/coursier-cache_2.11-2.0.0-RC2-2-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC2-2", "lang": "scala", "sha1": "4133d4cc342ce3f8c716d1bc5c786e83b93b9028", "sha256": "fa96065756a73647cf2d2193ff838c7dd5559c6ca2c4827dcde508445f835ea3", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC2-2/coursier-core_2.11-2.0.0-RC2-2.jar", "source": {"sha1": "67f1b0320e640a8a03d32b1a0f79188299d04c5c", "sha256": "fc633e10ec5f30734e0ca5841fd79bd3405d1c1c5bcdc6f7054c84c9edb48d1b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC2-2/coursier-core_2.11-2.0.0-RC2-2-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC2-2", "lang": "scala", "sha1": "a84b852d3a5af49a73244091e8df4162cae39bce", "sha256": "1f4e9b73d1392cc0510eccdb38daff312559777e5dd7a8b7d4bbbb403859f161", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC2-2/coursier_2.11-2.0.0-RC2-2.jar", "source": {"sha1": "e3de3b08ce12a00f2ce8bec13e91adc2f30f11b7", "sha256": "da363c99918ce251fad1d1d900ea4930810cfcb19c02051f1fe51581e7069512", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC2-2/coursier_2.11-2.0.0-RC2-2-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index ff77d4c3..39a7064e 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core", ""]
-      version: "2.0.0-RC1"
+      version: "2.0.0-RC2-2"
 
   org.apache.maven:
     maven:

From e252c10eda2119f120653d92c3a0ee87652ed8cd Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:49:10 -0600
Subject: [PATCH 13/18] cp

---
 3rdparty/workspace.bzl | 6 +++---
 dependencies.yaml      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index eefa1545..c7da378f 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -94,9 +94,9 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC2-2", "lang": "scala", "sha1": "8e0a649a1e1e5234a1b0a3e2a81a2d653f82c029", "sha256": "9bf7b366ff81e994a0e63bc3d61401de5d6d5e2fd5d3ff541730737ea0e27be7", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC2-2/coursier-cache_2.11-2.0.0-RC2-2.jar", "source": {"sha1": "127062550eb6832ed0d897c87f75fa419fd64ed2", "sha256": "76c02de53781253c8af6a24d33874958fedfe5d0aaa2f9094c4972a3ddfcc9ca", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC2-2/coursier-cache_2.11-2.0.0-RC2-2-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC2-2", "lang": "scala", "sha1": "4133d4cc342ce3f8c716d1bc5c786e83b93b9028", "sha256": "fa96065756a73647cf2d2193ff838c7dd5559c6ca2c4827dcde508445f835ea3", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC2-2/coursier-core_2.11-2.0.0-RC2-2.jar", "source": {"sha1": "67f1b0320e640a8a03d32b1a0f79188299d04c5c", "sha256": "fc633e10ec5f30734e0ca5841fd79bd3405d1c1c5bcdc6f7054c84c9edb48d1b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC2-2/coursier-core_2.11-2.0.0-RC2-2-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC2-2", "lang": "scala", "sha1": "a84b852d3a5af49a73244091e8df4162cae39bce", "sha256": "1f4e9b73d1392cc0510eccdb38daff312559777e5dd7a8b7d4bbbb403859f161", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC2-2/coursier_2.11-2.0.0-RC2-2.jar", "source": {"sha1": "e3de3b08ce12a00f2ce8bec13e91adc2f30f11b7", "sha256": "da363c99918ce251fad1d1d900ea4930810cfcb19c02051f1fe51581e7069512", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC2-2/coursier_2.11-2.0.0-RC2-2-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC2-6", "lang": "scala", "sha1": "fbe16138223870ec0faeb7f29e0901fefe618d09", "sha256": "91ebde69776a643a2d3ef02ab1433e00ce99ada7e7df91885a1c89e880f53920", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC2-6/coursier-cache_2.11-2.0.0-RC2-6.jar", "source": {"sha1": "9403de39fdc13bca5f9cbe86fe6038d893e5df6b", "sha256": "421bce83ab2b6c31c4e2fd65ead869a9b15aa7a2ee2300865699c695c0690898", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC2-6/coursier-cache_2.11-2.0.0-RC2-6-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC2-6", "lang": "scala", "sha1": "710a7e13ae5fb6a0608b8988dc2d8b17a0b502cf", "sha256": "726b26db419f52a22e47f10679b368c0f67664a21f1bfc2226468bb6bd199ca7", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC2-6/coursier-core_2.11-2.0.0-RC2-6.jar", "source": {"sha1": "4773095cefc1ecba365b24fa612bb515eca2ac61", "sha256": "b91d83a2e1ba29297ba91c592376a570d809e467af4a7d2d109477a468839034", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC2-6/coursier-core_2.11-2.0.0-RC2-6-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC2-6", "lang": "scala", "sha1": "2481caa8d93a0dc33133476a2e1bd7f3750bf659", "sha256": "a5575555b22199594006aa27c21a74b1bb65bd1ebe23f9b66db80a4651ed0320", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC2-6/coursier_2.11-2.0.0-RC2-6.jar", "source": {"sha1": "a3a54a23e279150d7ecf66b1d567fdad5ce70260", "sha256": "d43cc4a06509de8bafb67b6f37805273ca8e7ada201e5bcd0b2789d9aaa5e379", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC2-6/coursier_2.11-2.0.0-RC2-6-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index 39a7064e..66517d1d 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core", ""]
-      version: "2.0.0-RC2-2"
+      version: "2.0.0-RC2-6"
 
   org.apache.maven:
     maven:

From f874ec491a6dcb56758b7ab7f2e0571c3ce087ee Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:51:29 -0600
Subject: [PATCH 14/18] cp

---
 3rdparty/jvm/io/get_coursier/BUILD                       | 2 ++
 3rdparty/workspace.bzl                                   | 9 ++++++---
 dependencies.yaml                                        | 2 +-
 .../github/johnynek/bazel_deps/CoursierResolver.scala    | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/3rdparty/jvm/io/get_coursier/BUILD b/3rdparty/jvm/io/get_coursier/BUILD
index 16efddd5..bfdfeadd 100644
--- a/3rdparty/jvm/io/get_coursier/BUILD
+++ b/3rdparty/jvm/io/get_coursier/BUILD
@@ -24,6 +24,8 @@ scala_import(
         "//external:jar/io/get_coursier/coursier_cache_2_11"
     ],
     runtime_deps = [
+        "//3rdparty/jvm/org/fusesource/jansi:jansi",
+        "//3rdparty/jvm/org/jline:jline_terminal_jansi",
         "//3rdparty/jvm/org/scala_lang:scala_library",
         ":coursier_core"
     ],
diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index c7da378f..c2200b79 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -94,9 +94,9 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC2-6", "lang": "scala", "sha1": "fbe16138223870ec0faeb7f29e0901fefe618d09", "sha256": "91ebde69776a643a2d3ef02ab1433e00ce99ada7e7df91885a1c89e880f53920", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC2-6/coursier-cache_2.11-2.0.0-RC2-6.jar", "source": {"sha1": "9403de39fdc13bca5f9cbe86fe6038d893e5df6b", "sha256": "421bce83ab2b6c31c4e2fd65ead869a9b15aa7a2ee2300865699c695c0690898", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC2-6/coursier-cache_2.11-2.0.0-RC2-6-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC2-6", "lang": "scala", "sha1": "710a7e13ae5fb6a0608b8988dc2d8b17a0b502cf", "sha256": "726b26db419f52a22e47f10679b368c0f67664a21f1bfc2226468bb6bd199ca7", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC2-6/coursier-core_2.11-2.0.0-RC2-6.jar", "source": {"sha1": "4773095cefc1ecba365b24fa612bb515eca2ac61", "sha256": "b91d83a2e1ba29297ba91c592376a570d809e467af4a7d2d109477a468839034", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC2-6/coursier-core_2.11-2.0.0-RC2-6-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC2-6", "lang": "scala", "sha1": "2481caa8d93a0dc33133476a2e1bd7f3750bf659", "sha256": "a5575555b22199594006aa27c21a74b1bb65bd1ebe23f9b66db80a4651ed0320", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC2-6/coursier_2.11-2.0.0-RC2-6.jar", "source": {"sha1": "a3a54a23e279150d7ecf66b1d567fdad5ce70260", "sha256": "d43cc4a06509de8bafb67b6f37805273ca8e7ada201e5bcd0b2789d9aaa5e379", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC2-6/coursier_2.11-2.0.0-RC2-6-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC3-1", "lang": "scala", "sha1": "075829dad3a3cab40dc97f481daf8efb29385b08", "sha256": "5ecdadbac41cab1c9a51c7233d3a88ea4893cc642875c684e2aca6eb8a406bd6", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-1/coursier-cache_2.11-2.0.0-RC3-1.jar", "source": {"sha1": "5a4472cd688ebd8955087c68669ae7fd9640e484", "sha256": "22672798c33b4159bbc4cd673078bfb893021adbebafd19e5d0719541a55c54d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-1/coursier-cache_2.11-2.0.0-RC3-1-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC3-1", "lang": "scala", "sha1": "d0bb62837fd768b25947466ab09155bc2f379cc7", "sha256": "a14aa0032cd46fb25898e857ca175aebaa75df370dfc22000ec2d2bed894bb96", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-1/coursier-core_2.11-2.0.0-RC3-1.jar", "source": {"sha1": "dee64e44bd526f827e252f1d437309b272467926", "sha256": "ca22ded1237427a5b377b3cf8e9f0e456214cbd227d91b5c2ea98a58a8d1cdad", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-1/coursier-core_2.11-2.0.0-RC3-1-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC3-1", "lang": "scala", "sha1": "0f581cd4a96786c38383c8bf2028d44cf2e7f25a", "sha256": "403d4c2c97919b3b56f9d9b4490f85654e2949e2326b9baf23321f914f8337f7", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-1/coursier_2.11-2.0.0-RC3-1.jar", "source": {"sha1": "3d19009feb49e642af46edd6a6134ce585f00720", "sha256": "7337276c87aaafd6c27c4f9447ee0bb04f501e14eb2fb77624adad7f77c34ed2", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-1/coursier_2.11-2.0.0-RC3-1-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
@@ -160,6 +160,9 @@ def list_dependencies():
     {"artifact": "org.eclipse.aether:aether-util:1.1.0", "lang": "java", "sha1": "d0f84ba994f0133580e8b957a44593eaa03d42cd", "sha256": "556f083dd35fe7f430ac4a7705784191e39df6df89abc31b30cb538f53828d62", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/eclipse/aether/aether-util/1.1.0/aether-util-1.1.0.jar", "source": {"sha1": "dafe37ecbf804d2d0e366d2caca8b672a10bc31d", "sha256": "78d776f699e32b59a8f4c466b5400a4a7b33b9d95889adbb1c40186de2f61ec4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/eclipse/aether/aether-util/1.1.0/aether-util-1.1.0-sources.jar"} , "name": "org_eclipse_aether_aether_util", "actual": "@org_eclipse_aether_aether_util//jar", "bind": "jar/org/eclipse/aether/aether_util"},
     {"artifact": "org.eclipse.sisu:org.eclipse.sisu.inject:0.3.0", "lang": "java", "sha1": "6c25adce9ca9af097728ed57834e8807e3b6e2b5", "sha256": "11eec6fcc7a47c50c8d7fb7ac69920c33c70cb8df6b7a0d8eb751c813fb1928a", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.0/org.eclipse.sisu.inject-0.3.0.jar", "source": {"sha1": "307b67405739d50f99558f2c39d0cd03278cd78b", "sha256": "ec270a6509ef00ccddeb7094941ec99545f5585e0c29a90e7264b29990eb7b0c", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.0/org.eclipse.sisu.inject-0.3.0-sources.jar"} , "name": "org_eclipse_sisu_org_eclipse_sisu_inject", "actual": "@org_eclipse_sisu_org_eclipse_sisu_inject//jar", "bind": "jar/org/eclipse/sisu/org_eclipse_sisu_inject"},
     {"artifact": "org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.0", "lang": "java", "sha1": "3f53953a998d03b9b0f7d5098f63119e434af0ef", "sha256": "807e9bc9e28d57ec0cb6daf04c317b3e13de5899c0282ee0f76c009198739350", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.0/org.eclipse.sisu.plexus-0.3.0.jar", "source": {"sha1": "8f800decc0806f4504819a551d72f42b6146ad73", "sha256": "49943c1cadca44fb3a4f4dd1c0623da431d192b5427037ea763c17dd33234eec", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.0/org.eclipse.sisu.plexus-0.3.0-sources.jar"} , "name": "org_eclipse_sisu_org_eclipse_sisu_plexus", "actual": "@org_eclipse_sisu_org_eclipse_sisu_plexus//jar", "bind": "jar/org/eclipse/sisu/org_eclipse_sisu_plexus"},
+    {"artifact": "org.fusesource.jansi:jansi:1.18", "lang": "java", "sha1": "d9205bbcd4b5f9cd1effe752d18f73bd942d783f", "sha256": "109e64fc65767c7a1a3bd654709d76f107b0a3b39db32cbf11139e13a6f5229b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi/1.18/jansi-1.18.jar", "source": {"sha1": "9553a21528688c4a0b1248036dbd878c16afe47d", "sha256": "dcddb789ebf8efd8cedbafad6619a510fb5489600edd53d6c3aed5365fba215d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi/1.18/jansi-1.18-sources.jar"} , "name": "org_fusesource_jansi_jansi", "actual": "@org_fusesource_jansi_jansi//jar", "bind": "jar/org/fusesource/jansi/jansi"},
+    {"artifact": "org.jline:jline-terminal-jansi:3.12.1", "lang": "java", "sha1": "b288ab8a31970056457721817ee7a812beff3db9", "sha256": "5aefd139ebfd05fe7792bab8a0dc6d551d0e05ff0d6972d83fbdf4a4ad256cb3", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jansi/3.12.1/jline-terminal-jansi-3.12.1.jar", "source": {"sha1": "8e74f38f2e664d7004ef64a49b884e6ccc12a1e4", "sha256": "fcc6c58029a4a640dc177b4944d3951273671ac8729941f80058ed8a4fc57dbb", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jansi/3.12.1/jline-terminal-jansi-3.12.1-sources.jar"} , "name": "org_jline_jline_terminal_jansi", "actual": "@org_jline_jline_terminal_jansi//jar", "bind": "jar/org/jline/jline_terminal_jansi"},
+    {"artifact": "org.jline:jline-terminal:3.12.1", "lang": "java", "sha1": "c777448314e050d980a6b697c140f3bfe9eb7416", "sha256": "eb6115680f732562f0e8e6777f127dece81e23b25015925f3c4a2a900d48cc9e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal/3.12.1/jline-terminal-3.12.1.jar", "source": {"sha1": "03f3b61e6f3eafeba0c289b308926e0f93457140", "sha256": "02ea1d5de9d18306e0a0775716687f6fd779fa64a781a6e44325d4d9e6f78ec2", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal/3.12.1/jline-terminal-3.12.1-sources.jar"} , "name": "org_jline_jline_terminal", "actual": "@org_jline_jline_terminal//jar", "bind": "jar/org/jline/jline_terminal"},
     {"artifact": "org.scala-sbt:test-interface:1.0", "lang": "java", "sha1": "0a3f14d010c4cb32071f863d97291df31603b521", "sha256": "15f70b38bb95f3002fec9aea54030f19bb4ecfbad64c67424b5e5fea09cd749e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/scala-sbt/test-interface/1.0/test-interface-1.0.jar", "source": {"sha1": "d44b23e9e3419ad0e00b91bba764a48d43075000", "sha256": "c314491c9df4f0bd9dd125ef1d51228d70bd466ee57848df1cd1b96aea18a5ad", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/scala-sbt/test-interface/1.0/test-interface-1.0-sources.jar"} , "name": "org_scala_sbt_test_interface", "actual": "@org_scala_sbt_test_interface//jar", "bind": "jar/org/scala_sbt/test_interface"},
     {"artifact": "org.scalacheck:scalacheck_2.11:1.13.5", "lang": "scala", "sha1": "4800dfc0e73bd9af55a89ba7c8ec44c46b6f034f", "sha256": "7e55593585376e799b5c93561ee97b8c9e2a6e479205377e7bb9a77d5bd1f854", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/scalacheck/scalacheck_2.11/1.13.5/scalacheck_2.11-1.13.5.jar", "source": {"sha1": "0ed27a94e5d447b9a23cc169eb424092ed8d259a", "sha256": "d7ab366a782c957ba116aa47e7a86d4e74850c351875b0a347a235a1fe22c269", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/scalacheck/scalacheck_2.11/1.13.5/scalacheck_2.11-1.13.5-sources.jar"} , "name": "org_scalacheck_scalacheck_2_11", "actual": "@org_scalacheck_scalacheck_2_11//jar:file", "bind": "jar/org/scalacheck/scalacheck_2_11"},
     {"artifact": "org.scalactic:scalactic_2.11:3.0.5", "lang": "scala", "sha1": "84f9454a7ceaa2b05a5ef36a15b9a332c5a1c697", "sha256": "84723064f5716f38990fe6e65468aa39700c725484efceef015771d267341cf2", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/scalactic/scalactic_2.11/3.0.5/scalactic_2.11-3.0.5.jar", "source": {"sha1": "f6f5638d17bf489c89bf91fb92b75543e54661d8", "sha256": "b58cd691c1eda023e349e840ee55eb289ac5789c9642b5ac427932747ca38d52", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/scalactic/scalactic_2.11/3.0.5/scalactic_2.11-3.0.5-sources.jar"} , "name": "org_scalactic_scalactic_2_11", "actual": "@org_scalactic_scalactic_2_11//jar:file", "bind": "jar/org/scalactic/scalactic_2_11"},
diff --git a/dependencies.yaml b/dependencies.yaml
index 66517d1d..0932e051 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core", ""]
-      version: "2.0.0-RC2-6"
+      version: "2.0.0-RC3-1"
 
   org.apache.maven:
     maven:
diff --git a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
index 862778d9..1f55f615 100644
--- a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
+++ b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
@@ -180,7 +180,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
       val module = coursier.Module(Organization(c.group.asString), ModuleName(c.artifact.artifactId), Map.empty)
       val version = c.version.asString
       val f = FileCache().withChecksums(Seq(Some("SHA-1"), None)).withCachePolicies(Seq(CachePolicy.FetchMissing)).withPool(CoursierResolver.downloadPool).fetch
-      val task = ResolutionProcess.fetchOne[Task](repos, module, version, f).run
+      val task = ResolutionProcess.fetchOne[Task](repos, module, version, f, Seq()).run
 
       /*
        * we use Nested here to accumulate all the errors so we can

From 98e23e3ea4d567d605245352c28cd618b8b6d9b4 Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Mon, 14 Oct 2019 16:59:46 -0600
Subject: [PATCH 15/18] cp

---
 3rdparty/jvm/org/fusesource/jansi/BUILD | 13 +++++++++++
 3rdparty/jvm/org/jline/BUILD            | 29 +++++++++++++++++++++++++
 3rdparty/target_file.bzl                |  8 ++++++-
 3rdparty/workspace.bzl                  |  6 ++---
 dependencies.yaml                       |  2 +-
 5 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 3rdparty/jvm/org/fusesource/jansi/BUILD
 create mode 100644 3rdparty/jvm/org/jline/BUILD

diff --git a/3rdparty/jvm/org/fusesource/jansi/BUILD b/3rdparty/jvm/org/fusesource/jansi/BUILD
new file mode 100644
index 00000000..ccdf7e73
--- /dev/null
+++ b/3rdparty/jvm/org/fusesource/jansi/BUILD
@@ -0,0 +1,13 @@
+load("@io_bazel_rules_scala//scala:scala_import.bzl", "scala_import")
+load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
+java_library(
+    name = "jansi",
+    exports = [
+        "//external:jar/org/fusesource/jansi/jansi"
+    ],
+    visibility = [
+        "//3rdparty/jvm:__subpackages__"
+    ]
+)
+
+
diff --git a/3rdparty/jvm/org/jline/BUILD b/3rdparty/jvm/org/jline/BUILD
new file mode 100644
index 00000000..7215cf73
--- /dev/null
+++ b/3rdparty/jvm/org/jline/BUILD
@@ -0,0 +1,29 @@
+load("@io_bazel_rules_scala//scala:scala_import.bzl", "scala_import")
+load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
+java_library(
+    name = "jline_terminal",
+    exports = [
+        "//external:jar/org/jline/jline_terminal"
+    ],
+    visibility = [
+        "//3rdparty/jvm:__subpackages__"
+    ]
+)
+
+
+
+java_library(
+    name = "jline_terminal_jansi",
+    exports = [
+        "//external:jar/org/jline/jline_terminal_jansi"
+    ],
+    runtime_deps = [
+        "//3rdparty/jvm/org/fusesource/jansi:jansi",
+        ":jline_terminal"
+    ],
+    visibility = [
+        "//3rdparty/jvm:__subpackages__"
+    ]
+)
+
+
diff --git a/3rdparty/target_file.bzl b/3rdparty/target_file.bzl
index 9261bd0f..8da7f912 100644
--- a/3rdparty/target_file.bzl
+++ b/3rdparty/target_file.bzl
@@ -154,6 +154,9 @@ def list_target_data():
 "3rdparty/jvm/org/eclipse/aether:aether_util": ["lang||||||java","name||||||//3rdparty/jvm/org/eclipse/aether:aether_util","visibility||||||//visibility:public","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/eclipse/aether/aether_util","runtimeDeps|||L|||//3rdparty/jvm/org/eclipse/aether:aether_api","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/eclipse/sisu:org_eclipse_sisu_inject": ["lang||||||java","name||||||//3rdparty/jvm/org/eclipse/sisu:org_eclipse_sisu_inject","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/eclipse/sisu/org_eclipse_sisu_inject","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/eclipse/sisu:org_eclipse_sisu_plexus": ["lang||||||java","name||||||//3rdparty/jvm/org/eclipse/sisu:org_eclipse_sisu_plexus","visibility||||||//visibility:public","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/eclipse/sisu/org_eclipse_sisu_plexus","runtimeDeps|||L|||//3rdparty/jvm/org/codehaus/plexus:plexus_component_annotations|||//3rdparty/jvm/org/codehaus/plexus:plexus_utils|||//3rdparty/jvm/org/eclipse/sisu:org_eclipse_sisu_inject|||//3rdparty/jvm/org/codehaus/plexus:plexus_classworlds|||//3rdparty/jvm/javax/enterprise:cdi_api","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
+"3rdparty/jvm/org/fusesource/jansi:jansi": ["lang||||||java","name||||||//3rdparty/jvm/org/fusesource/jansi:jansi","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/fusesource/jansi/jansi","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
+"3rdparty/jvm/org/jline:jline_terminal": ["lang||||||java","name||||||//3rdparty/jvm/org/jline:jline_terminal","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/jline/jline_terminal","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
+"3rdparty/jvm/org/jline:jline_terminal_jansi": ["lang||||||java","name||||||//3rdparty/jvm/org/jline:jline_terminal_jansi","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/jline/jline_terminal_jansi","runtimeDeps|||L|||//3rdparty/jvm/org/fusesource/jansi:jansi|||//3rdparty/jvm/org/jline:jline_terminal","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/scala_sbt:test_interface": ["lang||||||java","name||||||//3rdparty/jvm/org/scala_sbt:test_interface","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/scala_sbt/test_interface","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/slf4j:jcl_over_slf4j": ["lang||||||java","name||||||//3rdparty/jvm/org/slf4j:jcl_over_slf4j","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/slf4j/jcl_over_slf4j","runtimeDeps|||L|||//3rdparty/jvm/org/slf4j:slf4j_api","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/slf4j:slf4j_api": ["lang||||||java","name||||||//3rdparty/jvm/org/slf4j:slf4j_api","visibility||||||//visibility:public","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/slf4j/slf4j_api","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
@@ -165,13 +168,16 @@ def list_target_data():
 "3rdparty/jvm/org/scala_lang:scala_library": ["lang||||||scala/unmangled:2.11.8","name||||||//3rdparty/jvm/org/scala_lang:scala_library","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/scala_lang:scala_reflect": ["lang||||||scala/unmangled:2.11.8","name||||||//3rdparty/jvm/org/scala_lang:scala_reflect","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||@io_bazel_rules_scala_scala_reflect//:io_bazel_rules_scala_scala_reflect","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/com/chuusai:shapeless": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/com/chuusai:shapeless","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/com/chuusai/shapeless_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/org/typelevel:macro_compat","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
+"3rdparty/jvm/com/github/alexarchambault:argonaut_shapeless_6_2": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/com/github/alexarchambault:argonaut_shapeless_6_2","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||import","deps|||L|||","jars|||L|||//external:jar/com/github/alexarchambault/argonaut_shapeless_6_2_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/io/argonaut:argonaut|||//3rdparty/jvm/com/chuusai:shapeless","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/com/monovore:decline": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/com/monovore:decline","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/com/monovore/decline_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/org/typelevel:cats_core","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
+"3rdparty/jvm/io/argonaut:argonaut": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/argonaut:argonaut","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/argonaut/argonaut_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_reflect","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/io/circe:circe_core": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/circe:circe_core","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/circe/circe_core_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/io/circe:circe_numbers|||//3rdparty/jvm/org/typelevel:cats_core","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/io/circe:circe_generic": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/circe:circe_generic","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/circe/circe_generic_2_11","sources|||L|||","exports|||L|||//3rdparty/jvm/com/chuusai:shapeless|||//3rdparty/jvm/org/typelevel:cats_core|||//3rdparty/jvm/org/typelevel:cats_kernel|||//3rdparty/jvm/org/typelevel:macro_compat","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/io/circe:circe_core","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/io/circe:circe_jackson25": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/circe:circe_jackson25","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/circe/circe_jackson25_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/io/circe:circe_core|||//3rdparty/jvm/com/fasterxml/jackson/core:jackson_core|||//3rdparty/jvm/com/fasterxml/jackson/core:jackson_databind","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/io/circe:circe_jawn": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/circe:circe_jawn","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/circe/circe_jawn_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/io/circe:circe_core|||//3rdparty/jvm/org/spire_math:jawn_parser","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/io/circe:circe_numbers": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/circe:circe_numbers","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/circe/circe_numbers_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
-"3rdparty/jvm/io/get_coursier:coursier_cache": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/get_coursier:coursier_cache","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/get_coursier/coursier_cache_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/io/get_coursier:coursier_core","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
+"3rdparty/jvm/io/get_coursier:coursier": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/get_coursier:coursier","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/get_coursier/coursier_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/io/get_coursier:coursier_core|||//3rdparty/jvm/io/get_coursier:coursier_cache|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/com/github/alexarchambault:argonaut_shapeless_6_2","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
+"3rdparty/jvm/io/get_coursier:coursier_cache": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/get_coursier:coursier_cache","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/get_coursier/coursier_cache_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/io/get_coursier:coursier_core|||//3rdparty/jvm/org/fusesource/jansi:jansi|||//3rdparty/jvm/org/jline:jline_terminal_jansi","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/io/get_coursier:coursier_core": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/get_coursier:coursier_core","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/get_coursier/coursier_core_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/org/scala_lang/modules:scala_xml","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/scala_lang/modules:scala_parser_combinators": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/org/scala_lang/modules:scala_parser_combinators","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||@io_bazel_rules_scala_scala_parser_combinators//:io_bazel_rules_scala_scala_parser_combinators","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/scala_lang/modules:scala_xml": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/org/scala_lang/modules:scala_xml","visibility||||||//visibility:public","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||@io_bazel_rules_scala_scala_xml//:io_bazel_rules_scala_scala_xml","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index c2200b79..21943c23 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -94,9 +94,9 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC3-1", "lang": "scala", "sha1": "075829dad3a3cab40dc97f481daf8efb29385b08", "sha256": "5ecdadbac41cab1c9a51c7233d3a88ea4893cc642875c684e2aca6eb8a406bd6", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-1/coursier-cache_2.11-2.0.0-RC3-1.jar", "source": {"sha1": "5a4472cd688ebd8955087c68669ae7fd9640e484", "sha256": "22672798c33b4159bbc4cd673078bfb893021adbebafd19e5d0719541a55c54d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-1/coursier-cache_2.11-2.0.0-RC3-1-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC3-1", "lang": "scala", "sha1": "d0bb62837fd768b25947466ab09155bc2f379cc7", "sha256": "a14aa0032cd46fb25898e857ca175aebaa75df370dfc22000ec2d2bed894bb96", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-1/coursier-core_2.11-2.0.0-RC3-1.jar", "source": {"sha1": "dee64e44bd526f827e252f1d437309b272467926", "sha256": "ca22ded1237427a5b377b3cf8e9f0e456214cbd227d91b5c2ea98a58a8d1cdad", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-1/coursier-core_2.11-2.0.0-RC3-1-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC3-1", "lang": "scala", "sha1": "0f581cd4a96786c38383c8bf2028d44cf2e7f25a", "sha256": "403d4c2c97919b3b56f9d9b4490f85654e2949e2326b9baf23321f914f8337f7", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-1/coursier_2.11-2.0.0-RC3-1.jar", "source": {"sha1": "3d19009feb49e642af46edd6a6134ce585f00720", "sha256": "7337276c87aaafd6c27c4f9447ee0bb04f501e14eb2fb77624adad7f77c34ed2", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-1/coursier_2.11-2.0.0-RC3-1-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC3-2", "lang": "scala", "sha1": "735a084db66af7994b76388848a1388ad728c40a", "sha256": "997766c51f683a8b29ed24a39385658be6aa92b463ca80a8c60e4c9165454d26", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-2/coursier-cache_2.11-2.0.0-RC3-2.jar", "source": {"sha1": "1380df15aea31a4005721f890380e5736506a8ec", "sha256": "35d46d604742aa1b6d8c91df2330b4b1bc30460f7ba268d3ac7f7ded10a56e14", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-2/coursier-cache_2.11-2.0.0-RC3-2-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC3-2", "lang": "scala", "sha1": "f3f13ceba5014aa1932c6f76d3be3ece5e0f7ef6", "sha256": "3c33f08b738afeb103a5b9260c17be2ed61f233b0f65d2c3c757146934dd6f0d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-2/coursier-core_2.11-2.0.0-RC3-2.jar", "source": {"sha1": "45cf4c47897c4ed5b88375511837f40c1a549a1c", "sha256": "cb3d0e85d795a81bccd76b9e31dd74bdd1d795dbc887378f209c38f80453b4df", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-2/coursier-core_2.11-2.0.0-RC3-2-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC3-2", "lang": "scala", "sha1": "5a004f634cf923f3a281b025eb29879917ebed1e", "sha256": "5f897bfe773ee49a678bfcba2b8f66e044cfa94d14da0582a215a6f388b1ff35", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-2/coursier_2.11-2.0.0-RC3-2.jar", "source": {"sha1": "8943050f177c1e62a64e16c9aec2b3f88b6ce62a", "sha256": "2a64f36b2b6e94355883766407b3397b003744587d05d44e4e0712917b18989a", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-2/coursier_2.11-2.0.0-RC3-2-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index 0932e051..c0b332c9 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core", ""]
-      version: "2.0.0-RC3-1"
+      version: "2.0.0-RC3-2"
 
   org.apache.maven:
     maven:

From 3f50ebd6b48e5eddd237d9b0fef3dd3f8ee07ae8 Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Tue, 15 Oct 2019 10:04:50 -0600
Subject: [PATCH 16/18] cp

---
 3rdparty/jvm/io/get_coursier/BUILD            | 20 +++++++++++--
 3rdparty/jvm/org/fusesource/jansi/BUILD       | 13 ---------
 3rdparty/jvm/org/jline/BUILD                  | 29 -------------------
 3rdparty/target_file.bzl                      |  8 ++---
 3rdparty/workspace.bzl                        | 10 +++----
 dependencies.yaml                             |  4 +--
 .../com/github/johnynek/bazel_deps/BUILD      |  1 +
 .../bazel_deps/CoursierResolver.scala         | 16 +++++-----
 8 files changed, 35 insertions(+), 66 deletions(-)
 delete mode 100644 3rdparty/jvm/org/fusesource/jansi/BUILD
 delete mode 100644 3rdparty/jvm/org/jline/BUILD

diff --git a/3rdparty/jvm/io/get_coursier/BUILD b/3rdparty/jvm/io/get_coursier/BUILD
index bfdfeadd..f987d496 100644
--- a/3rdparty/jvm/io/get_coursier/BUILD
+++ b/3rdparty/jvm/io/get_coursier/BUILD
@@ -24,10 +24,8 @@ scala_import(
         "//external:jar/io/get_coursier/coursier_cache_2_11"
     ],
     runtime_deps = [
-        "//3rdparty/jvm/org/fusesource/jansi:jansi",
-        "//3rdparty/jvm/org/jline:jline_terminal_jansi",
         "//3rdparty/jvm/org/scala_lang:scala_library",
-        ":coursier_core"
+        ":coursier_util"
     ],
     visibility = [
         "//visibility:public"
@@ -43,6 +41,22 @@ scala_import(
     ],
     runtime_deps = [
         "//3rdparty/jvm/org/scala_lang/modules:scala_xml",
+        "//3rdparty/jvm/org/scala_lang:scala_library",
+        ":coursier_util"
+    ],
+    visibility = [
+        "//visibility:public"
+    ]
+)
+
+
+
+scala_import(
+    name = "coursier_util",
+    jars = [
+        "//external:jar/io/get_coursier/coursier_util_2_11"
+    ],
+    runtime_deps = [
         "//3rdparty/jvm/org/scala_lang:scala_library"
     ],
     visibility = [
diff --git a/3rdparty/jvm/org/fusesource/jansi/BUILD b/3rdparty/jvm/org/fusesource/jansi/BUILD
deleted file mode 100644
index ccdf7e73..00000000
--- a/3rdparty/jvm/org/fusesource/jansi/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@io_bazel_rules_scala//scala:scala_import.bzl", "scala_import")
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-java_library(
-    name = "jansi",
-    exports = [
-        "//external:jar/org/fusesource/jansi/jansi"
-    ],
-    visibility = [
-        "//3rdparty/jvm:__subpackages__"
-    ]
-)
-
-
diff --git a/3rdparty/jvm/org/jline/BUILD b/3rdparty/jvm/org/jline/BUILD
deleted file mode 100644
index 7215cf73..00000000
--- a/3rdparty/jvm/org/jline/BUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-load("@io_bazel_rules_scala//scala:scala_import.bzl", "scala_import")
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-java_library(
-    name = "jline_terminal",
-    exports = [
-        "//external:jar/org/jline/jline_terminal"
-    ],
-    visibility = [
-        "//3rdparty/jvm:__subpackages__"
-    ]
-)
-
-
-
-java_library(
-    name = "jline_terminal_jansi",
-    exports = [
-        "//external:jar/org/jline/jline_terminal_jansi"
-    ],
-    runtime_deps = [
-        "//3rdparty/jvm/org/fusesource/jansi:jansi",
-        ":jline_terminal"
-    ],
-    visibility = [
-        "//3rdparty/jvm:__subpackages__"
-    ]
-)
-
-
diff --git a/3rdparty/target_file.bzl b/3rdparty/target_file.bzl
index 8da7f912..f30551b6 100644
--- a/3rdparty/target_file.bzl
+++ b/3rdparty/target_file.bzl
@@ -154,9 +154,6 @@ def list_target_data():
 "3rdparty/jvm/org/eclipse/aether:aether_util": ["lang||||||java","name||||||//3rdparty/jvm/org/eclipse/aether:aether_util","visibility||||||//visibility:public","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/eclipse/aether/aether_util","runtimeDeps|||L|||//3rdparty/jvm/org/eclipse/aether:aether_api","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/eclipse/sisu:org_eclipse_sisu_inject": ["lang||||||java","name||||||//3rdparty/jvm/org/eclipse/sisu:org_eclipse_sisu_inject","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/eclipse/sisu/org_eclipse_sisu_inject","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/eclipse/sisu:org_eclipse_sisu_plexus": ["lang||||||java","name||||||//3rdparty/jvm/org/eclipse/sisu:org_eclipse_sisu_plexus","visibility||||||//visibility:public","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/eclipse/sisu/org_eclipse_sisu_plexus","runtimeDeps|||L|||//3rdparty/jvm/org/codehaus/plexus:plexus_component_annotations|||//3rdparty/jvm/org/codehaus/plexus:plexus_utils|||//3rdparty/jvm/org/eclipse/sisu:org_eclipse_sisu_inject|||//3rdparty/jvm/org/codehaus/plexus:plexus_classworlds|||//3rdparty/jvm/javax/enterprise:cdi_api","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
-"3rdparty/jvm/org/fusesource/jansi:jansi": ["lang||||||java","name||||||//3rdparty/jvm/org/fusesource/jansi:jansi","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/fusesource/jansi/jansi","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
-"3rdparty/jvm/org/jline:jline_terminal": ["lang||||||java","name||||||//3rdparty/jvm/org/jline:jline_terminal","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/jline/jline_terminal","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
-"3rdparty/jvm/org/jline:jline_terminal_jansi": ["lang||||||java","name||||||//3rdparty/jvm/org/jline:jline_terminal_jansi","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/jline/jline_terminal_jansi","runtimeDeps|||L|||//3rdparty/jvm/org/fusesource/jansi:jansi|||//3rdparty/jvm/org/jline:jline_terminal","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/scala_sbt:test_interface": ["lang||||||java","name||||||//3rdparty/jvm/org/scala_sbt:test_interface","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/scala_sbt/test_interface","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/slf4j:jcl_over_slf4j": ["lang||||||java","name||||||//3rdparty/jvm/org/slf4j:jcl_over_slf4j","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/slf4j/jcl_over_slf4j","runtimeDeps|||L|||//3rdparty/jvm/org/slf4j:slf4j_api","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/slf4j:slf4j_api": ["lang||||||java","name||||||//3rdparty/jvm/org/slf4j:slf4j_api","visibility||||||//visibility:public","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||//external:jar/org/slf4j/slf4j_api","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
@@ -177,8 +174,9 @@ def list_target_data():
 "3rdparty/jvm/io/circe:circe_jawn": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/circe:circe_jawn","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/circe/circe_jawn_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/io/circe:circe_core|||//3rdparty/jvm/org/spire_math:jawn_parser","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/io/circe:circe_numbers": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/circe:circe_numbers","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/circe/circe_numbers_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/io/get_coursier:coursier": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/get_coursier:coursier","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/get_coursier/coursier_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/io/get_coursier:coursier_core|||//3rdparty/jvm/io/get_coursier:coursier_cache|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/com/github/alexarchambault:argonaut_shapeless_6_2","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
-"3rdparty/jvm/io/get_coursier:coursier_cache": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/get_coursier:coursier_cache","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/get_coursier/coursier_cache_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/io/get_coursier:coursier_core|||//3rdparty/jvm/org/fusesource/jansi:jansi|||//3rdparty/jvm/org/jline:jline_terminal_jansi","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
-"3rdparty/jvm/io/get_coursier:coursier_core": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/get_coursier:coursier_core","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/get_coursier/coursier_core_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/org/scala_lang/modules:scala_xml","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
+"3rdparty/jvm/io/get_coursier:coursier_cache": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/get_coursier:coursier_cache","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/get_coursier/coursier_cache_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/io/get_coursier:coursier_util|||//3rdparty/jvm/org/scala_lang:scala_library","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
+"3rdparty/jvm/io/get_coursier:coursier_core": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/get_coursier:coursier_core","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/get_coursier/coursier_core_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/io/get_coursier:coursier_util|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/org/scala_lang/modules:scala_xml","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
+"3rdparty/jvm/io/get_coursier:coursier_util": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/io/get_coursier:coursier_util","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/io/get_coursier/coursier_util_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/scala_lang/modules:scala_parser_combinators": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/org/scala_lang/modules:scala_parser_combinators","visibility||||||//3rdparty/jvm:__subpackages__","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||@io_bazel_rules_scala_scala_parser_combinators//:io_bazel_rules_scala_scala_parser_combinators","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/scala_lang/modules:scala_xml": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/org/scala_lang/modules:scala_xml","visibility||||||//visibility:public","kind||||||library","deps|||L|||","jars|||L|||","sources|||L|||","exports|||L|||@io_bazel_rules_scala_scala_xml//:io_bazel_rules_scala_scala_xml","runtimeDeps|||L|||","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
 "3rdparty/jvm/org/scalacheck:scalacheck": ["lang||||||scala:2.11.8","name||||||//3rdparty/jvm/org/scalacheck:scalacheck","visibility||||||//visibility:public","kind||||||import","deps|||L|||","jars|||L|||//external:jar/org/scalacheck/scalacheck_2_11","sources|||L|||","exports|||L|||","runtimeDeps|||L|||//3rdparty/jvm/org/scala_lang:scala_library|||//3rdparty/jvm/org/scala_sbt:test_interface","processorClasses|||L|||","generatesApi|||B|||false","licenses|||L|||","generateNeverlink|||B|||false"],
diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index 21943c23..b5a18f04 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -94,9 +94,10 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC3-2", "lang": "scala", "sha1": "735a084db66af7994b76388848a1388ad728c40a", "sha256": "997766c51f683a8b29ed24a39385658be6aa92b463ca80a8c60e4c9165454d26", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-2/coursier-cache_2.11-2.0.0-RC3-2.jar", "source": {"sha1": "1380df15aea31a4005721f890380e5736506a8ec", "sha256": "35d46d604742aa1b6d8c91df2330b4b1bc30460f7ba268d3ac7f7ded10a56e14", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-2/coursier-cache_2.11-2.0.0-RC3-2-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC3-2", "lang": "scala", "sha1": "f3f13ceba5014aa1932c6f76d3be3ece5e0f7ef6", "sha256": "3c33f08b738afeb103a5b9260c17be2ed61f233b0f65d2c3c757146934dd6f0d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-2/coursier-core_2.11-2.0.0-RC3-2.jar", "source": {"sha1": "45cf4c47897c4ed5b88375511837f40c1a549a1c", "sha256": "cb3d0e85d795a81bccd76b9e31dd74bdd1d795dbc887378f209c38f80453b4df", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-2/coursier-core_2.11-2.0.0-RC3-2-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC3-2", "lang": "scala", "sha1": "5a004f634cf923f3a281b025eb29879917ebed1e", "sha256": "5f897bfe773ee49a678bfcba2b8f66e044cfa94d14da0582a215a6f388b1ff35", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-2/coursier_2.11-2.0.0-RC3-2.jar", "source": {"sha1": "8943050f177c1e62a64e16c9aec2b3f88b6ce62a", "sha256": "2a64f36b2b6e94355883766407b3397b003744587d05d44e4e0712917b18989a", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-2/coursier_2.11-2.0.0-RC3-2-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC3-3", "lang": "scala", "sha1": "2f34b062c4a8f9124ab434cc8b15c5c65077140a", "sha256": "2ba30f407557988971d046eac39970708c8d68ff917fa3bd897d303b63129504", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-3/coursier-cache_2.11-2.0.0-RC3-3.jar", "source": {"sha1": "07682e0902d3a12f8180ebfd471927cd8f3e6c24", "sha256": "f19ce0b98dfe2f7a3544a77624655de8741e48b4a7473729c7961fa9858ad902", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-3/coursier-cache_2.11-2.0.0-RC3-3-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC3-3", "lang": "scala", "sha1": "1e138144c664cfc33fa2c0251a768ac76e0abbe8", "sha256": "64601e0aebce8411ddd65d1ec10eb94ab4785410a6fb3d461b8b2c91caca82d5", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-3/coursier-core_2.11-2.0.0-RC3-3.jar", "source": {"sha1": "59b49ae6975b9e3e6af5c901c7ab3414244b0473", "sha256": "a01786a72e4b50174e1199459d5bdf1578b64c158f82065ba6ad8ea43c98f711", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-3/coursier-core_2.11-2.0.0-RC3-3-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier-util_2.11:2.0.0-RC3-3", "lang": "scala", "sha1": "ea2658430e5f1c7d4b745ef8eeb7bec818a60007", "sha256": "5c78da9eb2c94bfbeae1cacd8ef1ddd3b4e6215a0f521509ceecc302a255568c", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-util_2.11/2.0.0-RC3-3/coursier-util_2.11-2.0.0-RC3-3.jar", "source": {"sha1": "8be3d4e06d2aed32cb7c311aaca52f017208559b", "sha256": "785b37f800b78e787b84d09336cce0bfe6ac65bb9df0665bd7404704c40aa51d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-util_2.11/2.0.0-RC3-3/coursier-util_2.11-2.0.0-RC3-3-sources.jar"} , "name": "io_get_coursier_coursier_util_2_11", "actual": "@io_get_coursier_coursier_util_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_util_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC3-3", "lang": "scala", "sha1": "3014b9ed0f454e5e2cefa23eb8b6b52b60e1443a", "sha256": "9c354ed016773626cf98dbd75ef9d3971f3d38ae6b2d095e84b364ebe2d7a958", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-3/coursier_2.11-2.0.0-RC3-3.jar", "source": {"sha1": "5a72bdc63033d69e1161568a2fca29dc184f404f", "sha256": "fe265bb0fcc10ecb153d18a5bc88bdf206a19c70ac080943a57793ea270497d2", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-3/coursier_2.11-2.0.0-RC3-3-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
@@ -160,9 +161,6 @@ def list_dependencies():
     {"artifact": "org.eclipse.aether:aether-util:1.1.0", "lang": "java", "sha1": "d0f84ba994f0133580e8b957a44593eaa03d42cd", "sha256": "556f083dd35fe7f430ac4a7705784191e39df6df89abc31b30cb538f53828d62", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/eclipse/aether/aether-util/1.1.0/aether-util-1.1.0.jar", "source": {"sha1": "dafe37ecbf804d2d0e366d2caca8b672a10bc31d", "sha256": "78d776f699e32b59a8f4c466b5400a4a7b33b9d95889adbb1c40186de2f61ec4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/eclipse/aether/aether-util/1.1.0/aether-util-1.1.0-sources.jar"} , "name": "org_eclipse_aether_aether_util", "actual": "@org_eclipse_aether_aether_util//jar", "bind": "jar/org/eclipse/aether/aether_util"},
     {"artifact": "org.eclipse.sisu:org.eclipse.sisu.inject:0.3.0", "lang": "java", "sha1": "6c25adce9ca9af097728ed57834e8807e3b6e2b5", "sha256": "11eec6fcc7a47c50c8d7fb7ac69920c33c70cb8df6b7a0d8eb751c813fb1928a", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.0/org.eclipse.sisu.inject-0.3.0.jar", "source": {"sha1": "307b67405739d50f99558f2c39d0cd03278cd78b", "sha256": "ec270a6509ef00ccddeb7094941ec99545f5585e0c29a90e7264b29990eb7b0c", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.0/org.eclipse.sisu.inject-0.3.0-sources.jar"} , "name": "org_eclipse_sisu_org_eclipse_sisu_inject", "actual": "@org_eclipse_sisu_org_eclipse_sisu_inject//jar", "bind": "jar/org/eclipse/sisu/org_eclipse_sisu_inject"},
     {"artifact": "org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.0", "lang": "java", "sha1": "3f53953a998d03b9b0f7d5098f63119e434af0ef", "sha256": "807e9bc9e28d57ec0cb6daf04c317b3e13de5899c0282ee0f76c009198739350", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.0/org.eclipse.sisu.plexus-0.3.0.jar", "source": {"sha1": "8f800decc0806f4504819a551d72f42b6146ad73", "sha256": "49943c1cadca44fb3a4f4dd1c0623da431d192b5427037ea763c17dd33234eec", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.0/org.eclipse.sisu.plexus-0.3.0-sources.jar"} , "name": "org_eclipse_sisu_org_eclipse_sisu_plexus", "actual": "@org_eclipse_sisu_org_eclipse_sisu_plexus//jar", "bind": "jar/org/eclipse/sisu/org_eclipse_sisu_plexus"},
-    {"artifact": "org.fusesource.jansi:jansi:1.18", "lang": "java", "sha1": "d9205bbcd4b5f9cd1effe752d18f73bd942d783f", "sha256": "109e64fc65767c7a1a3bd654709d76f107b0a3b39db32cbf11139e13a6f5229b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi/1.18/jansi-1.18.jar", "source": {"sha1": "9553a21528688c4a0b1248036dbd878c16afe47d", "sha256": "dcddb789ebf8efd8cedbafad6619a510fb5489600edd53d6c3aed5365fba215d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi/1.18/jansi-1.18-sources.jar"} , "name": "org_fusesource_jansi_jansi", "actual": "@org_fusesource_jansi_jansi//jar", "bind": "jar/org/fusesource/jansi/jansi"},
-    {"artifact": "org.jline:jline-terminal-jansi:3.12.1", "lang": "java", "sha1": "b288ab8a31970056457721817ee7a812beff3db9", "sha256": "5aefd139ebfd05fe7792bab8a0dc6d551d0e05ff0d6972d83fbdf4a4ad256cb3", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jansi/3.12.1/jline-terminal-jansi-3.12.1.jar", "source": {"sha1": "8e74f38f2e664d7004ef64a49b884e6ccc12a1e4", "sha256": "fcc6c58029a4a640dc177b4944d3951273671ac8729941f80058ed8a4fc57dbb", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jansi/3.12.1/jline-terminal-jansi-3.12.1-sources.jar"} , "name": "org_jline_jline_terminal_jansi", "actual": "@org_jline_jline_terminal_jansi//jar", "bind": "jar/org/jline/jline_terminal_jansi"},
-    {"artifact": "org.jline:jline-terminal:3.12.1", "lang": "java", "sha1": "c777448314e050d980a6b697c140f3bfe9eb7416", "sha256": "eb6115680f732562f0e8e6777f127dece81e23b25015925f3c4a2a900d48cc9e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal/3.12.1/jline-terminal-3.12.1.jar", "source": {"sha1": "03f3b61e6f3eafeba0c289b308926e0f93457140", "sha256": "02ea1d5de9d18306e0a0775716687f6fd779fa64a781a6e44325d4d9e6f78ec2", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal/3.12.1/jline-terminal-3.12.1-sources.jar"} , "name": "org_jline_jline_terminal", "actual": "@org_jline_jline_terminal//jar", "bind": "jar/org/jline/jline_terminal"},
     {"artifact": "org.scala-sbt:test-interface:1.0", "lang": "java", "sha1": "0a3f14d010c4cb32071f863d97291df31603b521", "sha256": "15f70b38bb95f3002fec9aea54030f19bb4ecfbad64c67424b5e5fea09cd749e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/scala-sbt/test-interface/1.0/test-interface-1.0.jar", "source": {"sha1": "d44b23e9e3419ad0e00b91bba764a48d43075000", "sha256": "c314491c9df4f0bd9dd125ef1d51228d70bd466ee57848df1cd1b96aea18a5ad", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/scala-sbt/test-interface/1.0/test-interface-1.0-sources.jar"} , "name": "org_scala_sbt_test_interface", "actual": "@org_scala_sbt_test_interface//jar", "bind": "jar/org/scala_sbt/test_interface"},
     {"artifact": "org.scalacheck:scalacheck_2.11:1.13.5", "lang": "scala", "sha1": "4800dfc0e73bd9af55a89ba7c8ec44c46b6f034f", "sha256": "7e55593585376e799b5c93561ee97b8c9e2a6e479205377e7bb9a77d5bd1f854", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/scalacheck/scalacheck_2.11/1.13.5/scalacheck_2.11-1.13.5.jar", "source": {"sha1": "0ed27a94e5d447b9a23cc169eb424092ed8d259a", "sha256": "d7ab366a782c957ba116aa47e7a86d4e74850c351875b0a347a235a1fe22c269", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/scalacheck/scalacheck_2.11/1.13.5/scalacheck_2.11-1.13.5-sources.jar"} , "name": "org_scalacheck_scalacheck_2_11", "actual": "@org_scalacheck_scalacheck_2_11//jar:file", "bind": "jar/org/scalacheck/scalacheck_2_11"},
     {"artifact": "org.scalactic:scalactic_2.11:3.0.5", "lang": "scala", "sha1": "84f9454a7ceaa2b05a5ef36a15b9a332c5a1c697", "sha256": "84723064f5716f38990fe6e65468aa39700c725484efceef015771d267341cf2", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/scalactic/scalactic_2.11/3.0.5/scalactic_2.11-3.0.5.jar", "source": {"sha1": "f6f5638d17bf489c89bf91fb92b75543e54661d8", "sha256": "b58cd691c1eda023e349e840ee55eb289ac5789c9642b5ac427932747ca38d52", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/scalactic/scalactic_2.11/3.0.5/scalactic_2.11-3.0.5-sources.jar"} , "name": "org_scalactic_scalactic_2_11", "actual": "@org_scalactic_scalactic_2_11//jar:file", "bind": "jar/org/scalactic/scalactic_2_11"},
diff --git a/dependencies.yaml b/dependencies.yaml
index c0b332c9..3f948bd4 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -51,8 +51,8 @@ dependencies:
   io.get-coursier:
     coursier:
       lang: scala
-      modules: [ "cache", "core", ""]
-      version: "2.0.0-RC3-2"
+      modules: [ "cache", "core", "util", ""]
+      version: "2.0.0-RC3-3"
 
   org.apache.maven:
     maven:
diff --git a/src/scala/com/github/johnynek/bazel_deps/BUILD b/src/scala/com/github/johnynek/bazel_deps/BUILD
index 6e55d813..7b82c9ad 100644
--- a/src/scala/com/github/johnynek/bazel_deps/BUILD
+++ b/src/scala/com/github/johnynek/bazel_deps/BUILD
@@ -54,6 +54,7 @@ scala_library(
         "//3rdparty/jvm/io/get_coursier:coursier_core",
         "//3rdparty/jvm/io/get_coursier:coursier_cache",
         "//3rdparty/jvm/io/get_coursier:coursier",
+        "//3rdparty/jvm/io/get_coursier:coursier_util",
         "//3rdparty/jvm/org/slf4j:slf4j_api",
         "//3rdparty/jvm/org/typelevel:cats_core",
         ":resolver",
diff --git a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
index 1f55f615..891b0d1c 100644
--- a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
+++ b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
@@ -1,8 +1,8 @@
 package com.github.johnynek.bazel_deps
 
-import coursier.{Artifact, Dependency, ResolutionProcess, Project, Resolution}
+import coursier.{Dependency, ResolutionProcess, Project, Resolution}
 import coursier.cache.{FileCache, CachePolicy}
-import coursier.util.Task
+import coursier.util.{Artifact, Task}
 import cats.MonadError
 import cats.data.{Nested, NonEmptyList, Validated, ValidatedNel}
 import cats.implicits._
@@ -56,7 +56,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
   // Instructs the coursier resolver to keep `runtime`-scoped dependencies.
   private[this] val DefaultConfiguration = "default(compile)"
 
-  def serverFor(a: coursier.Artifact): Option[MavenServer] =
+  def serverFor(a: Artifact): Option[MavenServer] =
     if (a.url.isEmpty) None
     else servers.find { ms => a.url.startsWith(ms.url) }
 
@@ -92,13 +92,13 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
 
     def lookup(c: MavenCoordinate): N[ResolvedShasValue] = {
 
-      def downloadShas(digestType: DigestType, as: List[coursier.Artifact]): Task[Option[ShaValue]] =
+      def downloadShas(digestType: DigestType, as: List[Artifact]): Task[Option[ShaValue]] =
         as.foldM(Option.empty[ShaValue]) {
           case (s @ Some(r), _) => Task.point(s)
           case (None, a) => downloadSha(digestType, a)
         }
 
-      def downloadSha(digestType: DigestType, a: coursier.Artifact): Task[Option[ShaValue]] = {
+      def downloadSha(digestType: DigestType, a: Artifact): Task[Option[ShaValue]] = {
         // Because Cache.file is hijacked to download SHAs directly (rather than signed artifacts) checksum verification
         // is turned off. Checksums don't themselves have checksum files.
         FileCache().withChecksums(Seq(None))
@@ -116,7 +116,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
         }
       }
 
-      def computeSha(digestType: DigestType, artifact: coursier.Artifact): Task[ShaValue] =
+      def computeSha(digestType: DigestType, artifact: Artifact): Task[ShaValue] =
         FileCache().withCachePolicies(Seq(CachePolicy.FetchMissing)).withPool(CoursierResolver.downloadPool).file(artifact).run.flatMap { e =>
           resolverMonad.fromTry(e match {
             case Left(error) =>
@@ -126,7 +126,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
           })
         }
 
-      def computeShas(digestType: DigestType, as: NonEmptyList[coursier.Artifact]): Task[ShaValue] = {
+      def computeShas(digestType: DigestType, as: NonEmptyList[Artifact]): Task[ShaValue] = {
         val errorFn: Throwable => Task[ShaValue] = as.tail match {
           case Nil => {e: Throwable =>
             resolverMonad.raiseError(new RuntimeException(s"we could not download the artifact ${c.asString} to compute the hash for digest type ${digestType} with error ${e}"))
@@ -150,7 +150,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
         }
       }
 
-      def processArtifact(src: Artifact.Source, dep: Dependency, proj: Project): Task[Option[JarDescriptor]] = {
+      def processArtifact(src: coursier.core.ArtifactSource, dep: Dependency, proj: Project): Task[Option[JarDescriptor]] = {
           val maybeArtifacts = src.artifacts(dep, proj, None)
             .map { case (_, artifact: Artifact) => artifact }
             .toList

From 6866d3726e525e7aa2c7bbf5746a8e09e3dbdb32 Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Tue, 15 Oct 2019 10:05:28 -0600
Subject: [PATCH 17/18] cp

---
 3rdparty/workspace.bzl | 8 ++++----
 dependencies.yaml      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index b5a18f04..0ebe511c 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -94,10 +94,10 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC3-3", "lang": "scala", "sha1": "2f34b062c4a8f9124ab434cc8b15c5c65077140a", "sha256": "2ba30f407557988971d046eac39970708c8d68ff917fa3bd897d303b63129504", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-3/coursier-cache_2.11-2.0.0-RC3-3.jar", "source": {"sha1": "07682e0902d3a12f8180ebfd471927cd8f3e6c24", "sha256": "f19ce0b98dfe2f7a3544a77624655de8741e48b4a7473729c7961fa9858ad902", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-3/coursier-cache_2.11-2.0.0-RC3-3-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC3-3", "lang": "scala", "sha1": "1e138144c664cfc33fa2c0251a768ac76e0abbe8", "sha256": "64601e0aebce8411ddd65d1ec10eb94ab4785410a6fb3d461b8b2c91caca82d5", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-3/coursier-core_2.11-2.0.0-RC3-3.jar", "source": {"sha1": "59b49ae6975b9e3e6af5c901c7ab3414244b0473", "sha256": "a01786a72e4b50174e1199459d5bdf1578b64c158f82065ba6ad8ea43c98f711", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-3/coursier-core_2.11-2.0.0-RC3-3-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier-util_2.11:2.0.0-RC3-3", "lang": "scala", "sha1": "ea2658430e5f1c7d4b745ef8eeb7bec818a60007", "sha256": "5c78da9eb2c94bfbeae1cacd8ef1ddd3b4e6215a0f521509ceecc302a255568c", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-util_2.11/2.0.0-RC3-3/coursier-util_2.11-2.0.0-RC3-3.jar", "source": {"sha1": "8be3d4e06d2aed32cb7c311aaca52f017208559b", "sha256": "785b37f800b78e787b84d09336cce0bfe6ac65bb9df0665bd7404704c40aa51d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-util_2.11/2.0.0-RC3-3/coursier-util_2.11-2.0.0-RC3-3-sources.jar"} , "name": "io_get_coursier_coursier_util_2_11", "actual": "@io_get_coursier_coursier_util_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_util_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC3-3", "lang": "scala", "sha1": "3014b9ed0f454e5e2cefa23eb8b6b52b60e1443a", "sha256": "9c354ed016773626cf98dbd75ef9d3971f3d38ae6b2d095e84b364ebe2d7a958", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-3/coursier_2.11-2.0.0-RC3-3.jar", "source": {"sha1": "5a72bdc63033d69e1161568a2fca29dc184f404f", "sha256": "fe265bb0fcc10ecb153d18a5bc88bdf206a19c70ac080943a57793ea270497d2", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-3/coursier_2.11-2.0.0-RC3-3-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC3-4", "lang": "scala", "sha1": "7c9c2d747426a5f5a535bc7ebf6fe61219c5ccb0", "sha256": "dad4fc446de7c289492eea0e448cb8188ed78030eb25515badb680847b4d94af", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-4/coursier-cache_2.11-2.0.0-RC3-4.jar", "source": {"sha1": "baa041bdbc9347afb335125af0c988134657578d", "sha256": "7fd0b1bc31e781cedfb4ed90b1151c6addf66ab1dd6a3c10f8146c298ea55f9b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-4/coursier-cache_2.11-2.0.0-RC3-4-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC3-4", "lang": "scala", "sha1": "bb5d78215bbf234c79e55426d4d599be5b778f07", "sha256": "4fd4b1603b7ff96f93661611380fbea73eb926f489211d81476dc6c5949cb5c3", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-4/coursier-core_2.11-2.0.0-RC3-4.jar", "source": {"sha1": "5eb6780306b44a3448e9623dcd1190f2c9871c96", "sha256": "90153121eb4699af71d28083cd95e26a61395df2716359c7465df5c8f33349ef", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-4/coursier-core_2.11-2.0.0-RC3-4-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier-util_2.11:2.0.0-RC3-4", "lang": "scala", "sha1": "b3bdfcb5e7ba9cb5946bb7de5f24f0d76048025f", "sha256": "53d928b671627a026048fe93a8abf4aa10e66b1bc21c7009f1785e5d682778a4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-util_2.11/2.0.0-RC3-4/coursier-util_2.11-2.0.0-RC3-4.jar", "source": {"sha1": "702376605c67deb1557984784a6cb1308222c0ab", "sha256": "1ba3098297d83f2351d105f32169be541758cddbe3dddf3a52a4fd3b365cfd17", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-util_2.11/2.0.0-RC3-4/coursier-util_2.11-2.0.0-RC3-4-sources.jar"} , "name": "io_get_coursier_coursier_util_2_11", "actual": "@io_get_coursier_coursier_util_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_util_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC3-4", "lang": "scala", "sha1": "7e6a1900116207665596343e33ea4604c5f332e7", "sha256": "7903eecad2ac1a150064e74eb82a8d8a5b2e48cdec1c4f72f47797bd2b8ff500", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-4/coursier_2.11-2.0.0-RC3-4.jar", "source": {"sha1": "efd89826c3064db13b19dd422323aa45d0284a8a", "sha256": "3d442698665c9b25eb95dc0c50f0314f36270f6390f38e8293b066475cbeffca", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-4/coursier_2.11-2.0.0-RC3-4-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index 3f948bd4..fbcb167e 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core", "util", ""]
-      version: "2.0.0-RC3-3"
+      version: "2.0.0-RC3-4"
 
   org.apache.maven:
     maven:

From d645d7d9d2d77a7593ea0cbb8342b6badba68d1f Mon Sep 17 00:00:00 2001
From: Ian O'Connell <ianoc@stripe.com>
Date: Tue, 15 Oct 2019 10:07:02 -0600
Subject: [PATCH 18/18] cp

---
 3rdparty/workspace.bzl                                    | 8 ++++----
 dependencies.yaml                                         | 2 +-
 .../com/github/johnynek/bazel_deps/CoursierResolver.scala | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
index 0ebe511c..03da326c 100644
--- a/3rdparty/workspace.bzl
+++ b/3rdparty/workspace.bzl
@@ -94,10 +94,10 @@ def list_dependencies():
     {"artifact": "io.circe:circe-jackson25_2.11:0.9.0", "lang": "scala", "sha1": "fa89394e3631898bb682c807f20a489c69d0581e", "sha256": "287f611627ac60dcabb5c7bc545ac0bb988fd44732aeb2b8e5799ba58cbda654", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0.jar", "source": {"sha1": "134c3633a77095b896bd5069ccdb9b04a523ec5f", "sha256": "0cdbf49f64a1f33bcfa608aee05164c9ea04fc71379ce8d42f3dd9c42f2b936b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jackson25_2.11/0.9.0/circe-jackson25_2.11-0.9.0-sources.jar"} , "name": "io_circe_circe_jackson25_2_11", "actual": "@io_circe_circe_jackson25_2_11//jar:file", "bind": "jar/io/circe/circe_jackson25_2_11"},
     {"artifact": "io.circe:circe-jawn_2.11:0.9.3", "lang": "scala", "sha1": "5d4329cb6ff6f9bf84d94e005331f46a05a90163", "sha256": "294e6c8add6ee214598855c58e9ad2c3c8c6f3247c0c4822b4b314b36e63a289", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3.jar", "source": {"sha1": "a3bd202a6a45f31224eb5af3e1679a05a8b4b6eb", "sha256": "568b03a50bb9fc4b9cb078b1d13c3985a334262dbb29ed975e465ad57acf6a03", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-jawn_2.11/0.9.3/circe-jawn_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_jawn_2_11", "actual": "@io_circe_circe_jawn_2_11//jar:file", "bind": "jar/io/circe/circe_jawn_2_11"},
     {"artifact": "io.circe:circe-numbers_2.11:0.9.3", "lang": "scala", "sha1": "bca36973eb5b69d109e8c3830442248f3ee26dc3", "sha256": "bdee05802a00862887c6ecc36edf15991e24aec43e412fa5afd1ee6ddf64c0cd", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3.jar", "source": {"sha1": "783acbf31bc2473093a7462f3551a4a2c4273275", "sha256": "6e9969e3e5e7c5c1d3ab360ef3a9951a29b5d787f81d43477c2f586c28df6e9d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/circe/circe-numbers_2.11/0.9.3/circe-numbers_2.11-0.9.3-sources.jar"} , "name": "io_circe_circe_numbers_2_11", "actual": "@io_circe_circe_numbers_2_11//jar:file", "bind": "jar/io/circe/circe_numbers_2_11"},
-    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC3-4", "lang": "scala", "sha1": "7c9c2d747426a5f5a535bc7ebf6fe61219c5ccb0", "sha256": "dad4fc446de7c289492eea0e448cb8188ed78030eb25515badb680847b4d94af", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-4/coursier-cache_2.11-2.0.0-RC3-4.jar", "source": {"sha1": "baa041bdbc9347afb335125af0c988134657578d", "sha256": "7fd0b1bc31e781cedfb4ed90b1151c6addf66ab1dd6a3c10f8146c298ea55f9b", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC3-4/coursier-cache_2.11-2.0.0-RC3-4-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
-    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC3-4", "lang": "scala", "sha1": "bb5d78215bbf234c79e55426d4d599be5b778f07", "sha256": "4fd4b1603b7ff96f93661611380fbea73eb926f489211d81476dc6c5949cb5c3", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-4/coursier-core_2.11-2.0.0-RC3-4.jar", "source": {"sha1": "5eb6780306b44a3448e9623dcd1190f2c9871c96", "sha256": "90153121eb4699af71d28083cd95e26a61395df2716359c7465df5c8f33349ef", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC3-4/coursier-core_2.11-2.0.0-RC3-4-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
-    {"artifact": "io.get-coursier:coursier-util_2.11:2.0.0-RC3-4", "lang": "scala", "sha1": "b3bdfcb5e7ba9cb5946bb7de5f24f0d76048025f", "sha256": "53d928b671627a026048fe93a8abf4aa10e66b1bc21c7009f1785e5d682778a4", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-util_2.11/2.0.0-RC3-4/coursier-util_2.11-2.0.0-RC3-4.jar", "source": {"sha1": "702376605c67deb1557984784a6cb1308222c0ab", "sha256": "1ba3098297d83f2351d105f32169be541758cddbe3dddf3a52a4fd3b365cfd17", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-util_2.11/2.0.0-RC3-4/coursier-util_2.11-2.0.0-RC3-4-sources.jar"} , "name": "io_get_coursier_coursier_util_2_11", "actual": "@io_get_coursier_coursier_util_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_util_2_11"},
-    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC3-4", "lang": "scala", "sha1": "7e6a1900116207665596343e33ea4604c5f332e7", "sha256": "7903eecad2ac1a150064e74eb82a8d8a5b2e48cdec1c4f72f47797bd2b8ff500", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-4/coursier_2.11-2.0.0-RC3-4.jar", "source": {"sha1": "efd89826c3064db13b19dd422323aa45d0284a8a", "sha256": "3d442698665c9b25eb95dc0c50f0314f36270f6390f38e8293b066475cbeffca", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC3-4/coursier_2.11-2.0.0-RC3-4-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
+    {"artifact": "io.get-coursier:coursier-cache_2.11:2.0.0-RC4", "lang": "scala", "sha1": "03ebe9a8d643a62f9c601b04d3de8103fde768b6", "sha256": "3b185b2a2385eb04ebdadbd9ad19b4a4e0b84b591da5666e1fc113d7c9e5ed24", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC4/coursier-cache_2.11-2.0.0-RC4.jar", "source": {"sha1": "9905d1a432c796e21968d76317afc6d011703cb7", "sha256": "29445305902d8a4e6362dfe5faddaa9ac17b3aa2958efa314f4bffe0a0c8129d", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-cache_2.11/2.0.0-RC4/coursier-cache_2.11-2.0.0-RC4-sources.jar"} , "name": "io_get_coursier_coursier_cache_2_11", "actual": "@io_get_coursier_coursier_cache_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_cache_2_11"},
+    {"artifact": "io.get-coursier:coursier-core_2.11:2.0.0-RC4", "lang": "scala", "sha1": "e62c60ed842edc58cb3e441a7a8c648b60a187a0", "sha256": "abc17b8959f9b3d1429162ed12abbbfee57c445831cbf4df2001c85126772891", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC4/coursier-core_2.11-2.0.0-RC4.jar", "source": {"sha1": "759dc2ccc2059608cc47b9301e4c629ab980b68c", "sha256": "df90c640374c411725852236d4a19df75e5b14acdf6e6a4e90e8bb35e4850701", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-core_2.11/2.0.0-RC4/coursier-core_2.11-2.0.0-RC4-sources.jar"} , "name": "io_get_coursier_coursier_core_2_11", "actual": "@io_get_coursier_coursier_core_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_core_2_11"},
+    {"artifact": "io.get-coursier:coursier-util_2.11:2.0.0-RC4", "lang": "scala", "sha1": "ed403c75c87ac78ee729d0617d6b45648d168634", "sha256": "9c07ef2ca26783dbc0d8d7fd47a797bda94bd5bd14a0e454edfeeee80cfe0a04", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-util_2.11/2.0.0-RC4/coursier-util_2.11-2.0.0-RC4.jar", "source": {"sha1": "9c4c18dee56cc1fa1e8fa26c5e33b9cd56cfe536", "sha256": "87944a6252fd374d569ee8b6c47e174ac54e777258579466010e84e2d2d92120", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier-util_2.11/2.0.0-RC4/coursier-util_2.11-2.0.0-RC4-sources.jar"} , "name": "io_get_coursier_coursier_util_2_11", "actual": "@io_get_coursier_coursier_util_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_util_2_11"},
+    {"artifact": "io.get-coursier:coursier_2.11:2.0.0-RC4", "lang": "scala", "sha1": "744022a1796c63866fd9e71bea002ec9b6104c1e", "sha256": "9c24564adedd9805ca9ec689f195710089b01145084280af6ad7e5c7243b6e55", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC4/coursier_2.11-2.0.0-RC4.jar", "source": {"sha1": "df067f3dc602b7740ab449810a2d05c4c900fa51", "sha256": "b90868e29affd0ef689b468fbb568b4be617eb35873458331136635e785f665a", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/io/get-coursier/coursier_2.11/2.0.0-RC4/coursier_2.11-2.0.0-RC4-sources.jar"} , "name": "io_get_coursier_coursier_2_11", "actual": "@io_get_coursier_coursier_2_11//jar:file", "bind": "jar/io/get_coursier/coursier_2_11"},
     {"artifact": "javax.annotation:jsr250-api:1.0", "lang": "java", "sha1": "5025422767732a1ab45d93abfea846513d742dcf", "sha256": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", "source": {"sha1": "9b1fba77edd118e13c42bda43d3c993dadd52c25", "sha256": "025c47d76c60199381be07012a0c5f9e74661aac5bd67f5aec847741c5b7f838", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"} , "name": "javax_annotation_jsr250_api", "actual": "@javax_annotation_jsr250_api//jar", "bind": "jar/javax/annotation/jsr250_api"},
     {"artifact": "javax.enterprise:cdi-api:1.0", "lang": "java", "sha1": "44c453f60909dfc223552ace63e05c694215156b", "sha256": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", "source": {"sha1": "3a3b9c3e5a1ec04c0c8b82e249cee7aeb4a96f9a", "sha256": "0e7c351dfe05759f84dc3eddaac1da4ef72578b494b53338829d34b12271374f", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"} , "name": "javax_enterprise_cdi_api", "actual": "@javax_enterprise_cdi_api//jar", "bind": "jar/javax/enterprise/cdi_api"},
     {"artifact": "javax.inject:javax.inject:1", "lang": "java", "sha1": "6975da39a7040257bd51d21a231b76c915872d38", "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar", "source": {"sha1": "a00123f261762a7c5e0ec916a2c7c8298d29c400", "sha256": "c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar"} , "name": "javax_inject_javax_inject", "actual": "@javax_inject_javax_inject//jar", "bind": "jar/javax/inject/javax_inject"},
diff --git a/dependencies.yaml b/dependencies.yaml
index fbcb167e..30b0fed5 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -52,7 +52,7 @@ dependencies:
     coursier:
       lang: scala
       modules: [ "cache", "core", "util", ""]
-      version: "2.0.0-RC3-4"
+      version: "2.0.0-RC4"
 
   org.apache.maven:
     maven:
diff --git a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
index 891b0d1c..e0d85b43 100644
--- a/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
+++ b/src/scala/com/github/johnynek/bazel_deps/CoursierResolver.scala
@@ -203,7 +203,7 @@ class CoursierResolver(servers: List[MavenServer], ec: ExecutionContext, runTime
             Classifier(c.artifact.classifier.getOrElse(""))
           ))
 
-          val srcDep = dep.copy(attributes = coursier.Attributes(
+          val srcDep = dep.withAttributes(coursier.Attributes(
             Type(c.artifact.packaging),
             Classifier("sources")
           ))