diff --git a/WORKSPACE b/WORKSPACE index 861da2583251a5..86e4b7e3dc45bf 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -121,23 +121,14 @@ local_repository( path = "./third_party/remoteapis/", ) -http_archive( +dist_http_archive( name = "desugar_jdk_libs", - # Commit e0b0291b2c51fbe5a7cfa14473a1ae850f94f021 of 2018-12-4 - # Computed using "shasum -a 256 " - sha256 = "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", - strip_prefix = "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021", - urls = [ - "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - ], ) distdir_tar( name = "additional_distfiles", # Keep in sync with the archives fetched as part of building bazel. archives = [ - "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", "coverage_output_generator-v2.5.zip", "android_tools_pkg-0.19.0rc3.tar.gz", # bazelbuild/rules_proto @@ -148,7 +139,6 @@ distdir_tar( dirname = "derived/distdir", dist_deps = {dep: attrs for dep, attrs in DIST_DEPS.items() if "additional_distfiles" in attrs["used_in"]}, sha256 = { - "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", "coverage_output_generator-v2.5.zip": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", "android_tools_pkg-0.19.0rc3.tar.gz": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", # bazelbuild/rules_proto @@ -157,10 +147,6 @@ distdir_tar( "382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz": "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c", }, urls = { - "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": [ - "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - ], "coverage_output_generator-v2.5.zip": [ "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip", ], diff --git a/distdir_deps.bzl b/distdir_deps.bzl index e36ea54708cea9..e35f956e9d3df8 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -211,6 +211,19 @@ DIST_DEPS = { "additional_distfiles", ], }, + "desugar_jdk_libs": { + # Commit b102111a91ee5910e680bc9e32146da3e081055e of 2020-08-01 + "archive": "b102111a91ee5910e680bc9e32146da3e081055e.zip", + "sha256": "2a043b861779ad382a75a6e3705c00a8168d433db07d09a883ae85912aa5009e", + "strip_prefix": "desugar_jdk_libs-b102111a91ee5910e680bc9e32146da3e081055e", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/b102111a91ee5910e680bc9e32146da3e081055e.zip", + "https://github.com/google/desugar_jdk_libs/archive/b102111a91ee5910e680bc9e32146da3e081055e.zip", + ], + "used_in": [ + "additional_distfiles", + ], + }, "remote_java_tools": { "aliases": ["remote_java_tools_test", "remote_java_tools_for_testing"], "archive": "java_tools-v11.1.zip",