From 0afcfbca54c8f00b268b919d4f2a3258a00ca518 Mon Sep 17 00:00:00 2001 From: "Shane F. Carr" Date: Thu, 4 Aug 2022 17:43:40 -0700 Subject: [PATCH] Cargo.toml fixups for ICU4X 1.0.0-beta1 --- Cargo.lock | 4 ++-- components/calendar/Cargo.toml | 4 ++-- components/collator/Cargo.toml | 2 +- components/collections/codepointtrie_builder/Cargo.toml | 5 +++-- components/datetime/Cargo.toml | 4 ++-- components/decimal/Cargo.toml | 2 +- components/icu/Cargo.toml | 2 +- components/list/Cargo.toml | 6 +++++- components/locid_transform/Cargo.toml | 2 +- components/normalizer/Cargo.toml | 2 +- components/plurals/Cargo.toml | 2 +- components/properties/Cargo.toml | 2 +- components/timezone/Cargo.toml | 2 +- experimental/segmenter/Cargo.toml | 4 ++-- provider/adapters/Cargo.toml | 2 +- provider/datagen/Cargo.toml | 4 ++-- utils/zerovec/Cargo.toml | 4 ++-- utils/zerovec/derive/Cargo.toml | 2 +- 18 files changed, 30 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aa9ffa94727..028b5f0c787 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4092,7 +4092,7 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.8.0" +version = "0.8.1" dependencies = [ "bincode", "criterion", @@ -4113,7 +4113,7 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.6.1" +version = "0.8.0" dependencies = [ "bincode", "proc-macro2", diff --git a/components/calendar/Cargo.toml b/components/calendar/Cargo.toml index 03abcdf08da..f0a498adaf8 100644 --- a/components/calendar/Cargo.toml +++ b/components/calendar/Cargo.toml @@ -50,8 +50,8 @@ databake = { version = "0.1.0", path = "../../utils/databake", optional = true, criterion = "0.3" icu = { path = "../icu", default-features = false } icu_benchmark_macros = { version = "0.7", path = "../../tools/benchmark/macros" } -icu_calendar = { version = "1.0.0-beta1", path = "../calendar", features = ["serde"] } -icu_testdata = { version = "1.0.0-beta1", path = "../../provider/testdata" } +icu_calendar = { path = "../calendar", features = ["serde"] } +icu_testdata = { path = "../../provider/testdata" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/components/collator/Cargo.toml b/components/collator/Cargo.toml index 0bef7e2c0ae..e19cada4064 100644 --- a/components/collator/Cargo.toml +++ b/components/collator/Cargo.toml @@ -47,7 +47,7 @@ databake = { version = "0.1.0", path = "../../utils/databake", optional = true, zerofrom = { version = "0.1.0", path = "../../utils/zerofrom" } [dev-dependencies] -icu_testdata = { version = "1.0.0-beta1", path = "../../provider/testdata" } +icu_testdata = { path = "../../provider/testdata" } atoi = "1.0.0" arraystring = "0.3.0" diff --git a/components/collections/codepointtrie_builder/Cargo.toml b/components/collections/codepointtrie_builder/Cargo.toml index 7961736c7c3..7781c0065b1 100644 --- a/components/collections/codepointtrie_builder/Cargo.toml +++ b/components/collections/codepointtrie_builder/Cargo.toml @@ -20,11 +20,12 @@ include = [ "tests/**/*", "Cargo.toml", "LICENSE", - "README.md" + "README.md", + "list_to_ucptrie.wasm" ] [dependencies] -icu_collections = { path = "..", features = ["serde"] } +icu_collections = { version = "1.0.0-beta1", path = "..", features = ["serde"] } lazy_static = { version = "1.4.0" } toml = "0.5" diff --git a/components/datetime/Cargo.toml b/components/datetime/Cargo.toml index 5046c099be8..9a4d2502c71 100644 --- a/components/datetime/Cargo.toml +++ b/components/datetime/Cargo.toml @@ -56,9 +56,9 @@ icu = { path = "../icu", default-features = false, features = ["experimental"] } icu_benchmark_macros = { version = "0.7", path = "../../tools/benchmark/macros" } icu_provider = { version = "1.0.0-beta1", path = "../../provider/core" } icu_provider_adapters = { path = "../../provider/adapters" } -icu_testdata = { version = "1.0.0-beta1", path = "../../provider/testdata", features = ["baked"] } +icu_testdata = { path = "../../provider/testdata", features = ["baked"] } icu_calendar = { version = "1.0.0-beta1", path = "../calendar", features = ["serde"] } -icu_datetime = { version = "1.0.0-beta1", path = "../../components/datetime", features = ["datagen"] } +icu_datetime = { path = "../../components/datetime", features = ["datagen"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/components/decimal/Cargo.toml b/components/decimal/Cargo.toml index 03eed8bff2a..959c8038be8 100644 --- a/components/decimal/Cargo.toml +++ b/components/decimal/Cargo.toml @@ -43,7 +43,7 @@ databake = { version = "0.1.0", path = "../../utils/databake", optional = true, criterion = "0.3" icu = { path = "../icu", default-features = false } icu_benchmark_macros = { version = "0.7", path = "../../tools/benchmark/macros" } -icu_testdata = { version = "1.0.0-beta1", path = "../../provider/testdata" } +icu_testdata = { path = "../../provider/testdata" } icu_provider_adapters = { path = "../../provider/adapters" } rand = "0.8" rand_pcg = "0.3" diff --git a/components/icu/Cargo.toml b/components/icu/Cargo.toml index b8f0ea2a3d2..a39ef70de0a 100644 --- a/components/icu/Cargo.toml +++ b/components/icu/Cargo.toml @@ -43,7 +43,7 @@ icu_timezone = { version = "1.0.0-beta1", path = "../timezone", default-features icu_segmenter = { version = "1.0.0-alpha1", path = "../../experimental/segmenter", default-features = false, optional = true } [dev-dependencies] -icu_testdata = { version = "1.0.0-beta1", path = "../../provider/testdata" } +icu_testdata = { path = "../../provider/testdata" } [features] default = [] diff --git a/components/list/Cargo.toml b/components/list/Cargo.toml index 9f9f577ddfb..497a7767a76 100644 --- a/components/list/Cargo.toml +++ b/components/list/Cargo.toml @@ -15,7 +15,11 @@ categories = ["internationalization"] # Keep this in sync with other crates unless there are exceptions include = [ "src/**/*", + "examples/**/*", + "benches/**/*", + "tests/**/*", "Cargo.toml", + "LICENSE", "README.md" ] @@ -34,7 +38,7 @@ databake = { version = "0.1.0", path = "../../utils/databake", optional = true, criterion = "0.3.3" serde_json = "1" postcard = { version = "1.0.0-alpha.4", features = ["use-std"] } -icu_testdata = { version = "1.0.0-beta1", path = "../../provider/testdata", features = ["baked"] } +icu_testdata = { path = "../../provider/testdata", features = ["baked"] } icu_benchmark_macros = { version = "0.7", path = "../../tools/benchmark/macros" } [lib] diff --git a/components/locid_transform/Cargo.toml b/components/locid_transform/Cargo.toml index 9313b34d494..5f55d4ef0f7 100644 --- a/components/locid_transform/Cargo.toml +++ b/components/locid_transform/Cargo.toml @@ -40,7 +40,7 @@ databake = { version = "0.1.0", path = "../../utils/databake", optional = true, [dev-dependencies] criterion = "0.3.3" -icu_testdata = { version = "1.0.0-beta1", path = "../../provider/testdata" } +icu_testdata = { path = "../../provider/testdata" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/components/normalizer/Cargo.toml b/components/normalizer/Cargo.toml index 9c3045904c5..7019fd1ec6b 100644 --- a/components/normalizer/Cargo.toml +++ b/components/normalizer/Cargo.toml @@ -46,7 +46,7 @@ databake = { version = "0.1.0", path = "../../utils/databake", optional = true, zerofrom = { version = "0.1.0", path = "../../utils/zerofrom" } [dev-dependencies] -icu_testdata = { version = "1.0.0-beta1", path = "../../provider/testdata" } +icu_testdata = { path = "../../provider/testdata" } atoi = "1.0.0" arraystring = "0.3.0" arrayvec = "0.7.2" diff --git a/components/plurals/Cargo.toml b/components/plurals/Cargo.toml index 616156f448f..bf5872c293f 100644 --- a/components/plurals/Cargo.toml +++ b/components/plurals/Cargo.toml @@ -46,7 +46,7 @@ icu = { path = "../icu", default-features = false } icu_benchmark_macros = { version = "0.7", path = "../../tools/benchmark/macros" } icu_provider = { version = "1.0.0-beta1", path = "../../provider/core" } icu_locid = { version = "1.0.0-beta1", path = "../locid" } -icu_testdata = { version = "1.0.0-beta1", path = "../../provider/testdata" } +icu_testdata = { path = "../../provider/testdata" } serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } diff --git a/components/properties/Cargo.toml b/components/properties/Cargo.toml index a5bc272db14..f4be4c2dab1 100644 --- a/components/properties/Cargo.toml +++ b/components/properties/Cargo.toml @@ -42,7 +42,7 @@ databake = { version = "0.1.0", path = "../../utils/databake", optional = true, [dev-dependencies] icu = { path = "../icu", default-features = false } -icu_testdata = { version = "1.0.0-beta1", path = "../../provider/testdata" } +icu_testdata = { path = "../../provider/testdata" } [lib] bench = false # This option is required for Benchmark CI diff --git a/components/timezone/Cargo.toml b/components/timezone/Cargo.toml index e88acb21575..14ac6b0d9d4 100644 --- a/components/timezone/Cargo.toml +++ b/components/timezone/Cargo.toml @@ -49,4 +49,4 @@ databake = { version = "0.1.0", path = "../../utils/databake", optional = true, [dev-dependencies] icu = { path = "../../components/icu", default-features = false, features = ["experimental"] } -icu_testdata = { version = "1.0.0-beta1", path = "../../provider/testdata" } +icu_testdata = { path = "../../provider/testdata" } diff --git a/experimental/segmenter/Cargo.toml b/experimental/segmenter/Cargo.toml index 95d27ddef7b..ca39daa675b 100644 --- a/experimental/segmenter/Cargo.toml +++ b/experimental/segmenter/Cargo.toml @@ -28,7 +28,7 @@ include = [ skip_optional_dependencies = true [dependencies] -icu_collections = { path = "../../components/collections" } +icu_collections = { version = "1.0.0-beta1", path = "../../components/collections" } icu_provider = { version = "1.0.0-beta1", path = "../../provider/core", features = ["macros"] } serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true } serde_json = { version = "1.0", default-features = false, features = ["alloc"] } @@ -41,7 +41,7 @@ icu_locid = { version = "1.0.0-beta1", path = "../../components/locid" } [dev-dependencies] criterion = "0.3" -icu_testdata = { version = "1.0.0-beta1", path = "../../provider/testdata" } +icu_testdata = { path = "../../provider/testdata" } serde-json-core = { version = "0.4", features = ["std"] } [lib] diff --git a/provider/adapters/Cargo.toml b/provider/adapters/Cargo.toml index 7b1148f108a..9e069e180c1 100644 --- a/provider/adapters/Cargo.toml +++ b/provider/adapters/Cargo.toml @@ -30,7 +30,7 @@ yoke = { version = "0.6", path = "../../utils/yoke" } zerovec = { version = "0.8", path = "../../utils/zerovec", features = ["yoke"] } serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true } databake = { version = "0.1.0", path = "../../utils/databake", optional = true, features = ["derive"]} -tinystr = { path = "../../utils/tinystr", features = ["zerovec"] } +tinystr = { version = "0.6", path = "../../utils/tinystr", features = ["zerovec"] } [dev-dependencies] icu_testdata = { path = "../testdata" } diff --git a/provider/datagen/Cargo.toml b/provider/datagen/Cargo.toml index 019299a3675..a6bb961b7d1 100644 --- a/provider/datagen/Cargo.toml +++ b/provider/datagen/Cargo.toml @@ -59,7 +59,7 @@ icu_provider_fs = { version = "1.0.0-beta1", path = "../fs", features = ["export displaydoc = { version = "0.2.3", default-features = false } elsa = "1.7" icu_collections = { version = "1.0.0-beta1", path = "../../components/collections", features = ["serde"] } -icu_codepointtrie_builder = { path = "../../components/collections/codepointtrie_builder" } +icu_codepointtrie_builder = { version = "0.3.3", path = "../../components/collections/codepointtrie_builder" } icu_locid = { version = "1.0.0-beta1", path = "../../components/locid", features = ["std"]} itertools = "0.10" log = "0.4" @@ -78,7 +78,7 @@ syn = {version = "1.0", features = ["parsing"] } writeable = { version = "0.4", path = "../../utils/writeable" } zip = "0.6" cached-path = "0.5" -reqwest = { version = "*", features = ["blocking"] } +reqwest = { version = "0.11", features = ["blocking"] } lazy_static = "1" # Dependencies for "bin" feature diff --git a/utils/zerovec/Cargo.toml b/utils/zerovec/Cargo.toml index 1e31e433f12..e881cea3e52 100644 --- a/utils/zerovec/Cargo.toml +++ b/utils/zerovec/Cargo.toml @@ -5,7 +5,7 @@ [package] name = "zerovec" description = "Zero-copy vector backed by a byte array" -version = "0.8.0" +version = "0.8.1" authors = ["The ICU4X Project Developers"] edition = "2018" readme = "README.md" @@ -29,7 +29,7 @@ all-features = true serde = { version = "1.0", optional = true, default-features = false, features = ["alloc"] } yoke = { version = "0.6.0", path = "../yoke", optional = true } zerofrom = { version = "0.1.0", path = "../zerofrom" } -zerovec-derive = {version = "0.6.0", path = "./derive", optional = true} +zerovec-derive = {version = "0.8.0", path = "./derive", optional = true} databake = { version = "0.1.0", path = "../../utils/databake", features = ["derive"], optional = true } [dev-dependencies] diff --git a/utils/zerovec/derive/Cargo.toml b/utils/zerovec/derive/Cargo.toml index 8354f82a132..614dee6bcfe 100644 --- a/utils/zerovec/derive/Cargo.toml +++ b/utils/zerovec/derive/Cargo.toml @@ -4,7 +4,7 @@ [package] name = "zerovec-derive" -version = "0.6.1" +version = "0.8.0" description = "Custom derive for the zerovec crate" repository = "https://github.com/unicode-org/icu4x" license = "Unicode-DFS-2016"