From 0489c9290828442fb5862be6be0e43211a26fea3 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Thu, 12 Nov 2020 20:00:40 +1000 Subject: [PATCH] drop El Capitan support --- cargo/BUILD.bazel | 2 +- cargo/Cargo.lock | 5 +++-- cargo/crates.bzl | 14 +++++++------- cargo/licenses.json | 2 +- ...-0.1.14.bazel => BUILD.coarsetime-0.1.16.bazel} | 2 +- cargo/update.py | 2 -- rslib/Cargo.toml | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) rename cargo/remote/{BUILD.coarsetime-0.1.14.bazel => BUILD.coarsetime-0.1.16.bazel} (98%) diff --git a/cargo/BUILD.bazel b/cargo/BUILD.bazel index fd23790ac..4b322d748 100644 --- a/cargo/BUILD.bazel +++ b/cargo/BUILD.bazel @@ -59,7 +59,7 @@ alias( alias( name = "coarsetime", - actual = "@raze__coarsetime__0_1_14//:coarsetime", + actual = "@raze__coarsetime__0_1_16//:coarsetime", tags = [ "cargo-raze", "manual", diff --git a/cargo/Cargo.lock b/cargo/Cargo.lock index 6e485b5d7..16a49f82b 100644 --- a/cargo/Cargo.lock +++ b/cargo/Cargo.lock @@ -268,8 +268,9 @@ dependencies = [ [[package]] name = "coarsetime" -version = "0.1.14" -source = "git+https://github.com/ankitects/rust-coarsetime.git?tag=anki-2020-11-03#f9e2c86216f0f4803bc75404828318fc206dab29" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cbaaa2e4f75bd7eff165a3d24345a374efddbe0e90be326e62048937e56f65a" dependencies = [ "lazy_static", "libc", diff --git a/cargo/crates.bzl b/cargo/crates.bzl index c9239be1b..18e2f46f5 100644 --- a/cargo/crates.bzl +++ b/cargo/crates.bzl @@ -322,13 +322,13 @@ def raze_fetch_remote_crates(): ) maybe( - new_git_repository, - name = "raze__coarsetime__0_1_14", - remote = "https://github.com/ankitects/rust-coarsetime.git", - shallow_since = "1594611111 +1000", - commit = "f9e2c86216f0f4803bc75404828318fc206dab29", - build_file = Label("//cargo/remote:BUILD.coarsetime-0.1.14.bazel"), - init_submodules = True, + http_archive, + name = "raze__coarsetime__0_1_16", + url = "https://crates.io/api/v1/crates/coarsetime/0.1.16/download", + type = "tar.gz", + sha256 = "0cbaaa2e4f75bd7eff165a3d24345a374efddbe0e90be326e62048937e56f65a", + strip_prefix = "coarsetime-0.1.16", + build_file = Label("//cargo/remote:BUILD.coarsetime-0.1.16.bazel"), ) maybe( diff --git a/cargo/licenses.json b/cargo/licenses.json index 0160f25b0..180f434a2 100644 --- a/cargo/licenses.json +++ b/cargo/licenses.json @@ -280,7 +280,7 @@ }, { "name": "coarsetime", - "version": "0.1.14", + "version": "0.1.16", "authors": "Frank Denis ", "repository": "https://github.com/jedisct1/rust-coarsetime", "license": "ISC", diff --git a/cargo/remote/BUILD.coarsetime-0.1.14.bazel b/cargo/remote/BUILD.coarsetime-0.1.16.bazel similarity index 98% rename from cargo/remote/BUILD.coarsetime-0.1.14.bazel rename to cargo/remote/BUILD.coarsetime-0.1.16.bazel index 7f2692e72..ecc6b3617 100644 --- a/cargo/remote/BUILD.coarsetime-0.1.14.bazel +++ b/cargo/remote/BUILD.coarsetime-0.1.16.bazel @@ -47,7 +47,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.1.14", + version = "0.1.16", # buildifier: leave-alone deps = [ "@raze__lazy_static__1_4_0//:lazy_static", diff --git a/cargo/update.py b/cargo/update.py index 17a3799af..b10157d06 100644 --- a/cargo/update.py +++ b/cargo/update.py @@ -23,8 +23,6 @@ COMMITS_SHALLOW_SINCE = { "96e1358555c49905de89170f2b1102a7d8b6c4c2": "1598411535 +1000", # prost "4ded4a98ef339da0b7babd4efee3fbe8adaf746b": "1598739849 -0700", - # coarsetime - "f9e2c86216f0f4803bc75404828318fc206dab29": "1594611111 +1000", # pyo3 "3b3ba4e3abd57bc3b8f86444b3f61e6e2f4c5fc1": "1603809036 +0900", } diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml index 6f1ab5d55..6dd5d0642 100644 --- a/rslib/Cargo.toml +++ b/rslib/Cargo.toml @@ -32,7 +32,7 @@ async-compression = { version = "0.3.5", features = ["stream", "gzip"] } blake3 = "0.3.5" bytes = "0.5.5" chrono = "0.4.13" -coarsetime = { git = "https://github.com/ankitects/rust-coarsetime.git", tag="anki-2020-11-03" } +coarsetime = "0.1.16" failure = "0.1.8" flate2 = "1.0.16" fluent = "0.13.1"