Skip to content

Commit

Permalink
Bump versions of semver-broken crates to {N+1}-dev (unicode-org#5769)
Browse files Browse the repository at this point in the history 
I think we should in the future do this as soon as we make a
semver-breaking change anywhere, as it's much harder to do this after
the fact. We can use the `-dev` tag to avoid bumping a crate twice, and
it's easy to remove the tag before a release (or replace with `beta`).
  • Loading branch information
@robertbastian
robertbastian authored Nov 4, 2024
1 parent 84ffe56 commit 7a2aa53
Show file tree
Hide file tree
Showing 36 changed files with 171 additions and 176 deletions.
112 changes: 56 additions & 56 deletions Cargo.lock
View file

Large diffs are not rendered by default.

112 changes: 56 additions & 56 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ exclude = [
]

[workspace.package]
version = "1.5.0"
version = "2.0.0-dev"
rust-version = "1.71.1"
authors = ["The ICU4X Project Developers"]
edition = "2021"
Expand All @@ -130,80 +130,80 @@ include = [

# ICU4X core
# These use non-tilde deps, see https://github.com/unicode-org/icu4x/issues/4343
icu_locale_core = { version = "1.5.0", path = "components/locale_core", default-features = false }
icu_provider = { version = "1.5.0", path = "provider/core", default-features = false }
icu_locale_core = { version = "2.0.0-dev", path = "components/locale_core", default-features = false }
icu_provider = { version = "2.0.0-dev", path = "provider/core", default-features = false }
icu_pattern = { version = "0.3.0-dev", path = "components/pattern", default-features = false }

# Components
icu = { version = "~1.5.0", path = "components/icu", default-features = false }
icu_calendar = { version = "~1.5.0", path = "components/calendar", default-features = false }
icu_casemap = { version = "~1.5.0", path = "components/casemap", default-features = false }
icu_collator = { version = "~1.5.0", path = "components/collator", default-features = false }
icu_collections = { version = "~1.5.0", path = "components/collections", default-features = false }
icu_codepointtrie_builder = { version = "0.3.8", path = "components/collections/codepointtrie_builder", default-features = false }
icu_datetime = { version = "~1.5.0", path = "components/datetime", default-features = false }
icu_decimal = { version = "~1.5.0", path = "components/decimal", default-features = false }
icu_experimental = { version = "~0.1.0", path = "components/experimental", default-features = false }
icu_list = { version = "~1.5.0", path = "components/list", default-features = false }
icu_locale = { version = "~1.5.0", path = "components/locale", default-features = false }
icu_normalizer = { version = "~1.5.0", path = "components/normalizer", default-features = false }
icu_pattern = { version = "0.2.0", path = "components/pattern", default-features = false }
icu_plurals = { version = "~1.5.0", path = "components/plurals", default-features = false }
icu_properties = { version = "~1.5.0", path = "components/properties", default-features = false }
icu_segmenter = { version = "~1.5.0", path = "components/segmenter", default-features = false }
icu_timezone = { version = "~1.5.0", path = "components/timezone", default-features = false }
icu = { version = "~2.0.0-dev", path = "components/icu", default-features = false }
icu_calendar = { version = "~2.0.0-dev", path = "components/calendar", default-features = false }
icu_casemap = { version = "~2.0.0-dev", path = "components/casemap", default-features = false }
icu_collator = { version = "~2.0.0-dev", path = "components/collator", default-features = false }
icu_collections = { version = "~2.0.0-dev", path = "components/collections", default-features = false }
icu_codepointtrie_builder = { version = "~0.4.0-dev", path = "components/collections/codepointtrie_builder", default-features = false }
icu_datetime = { version = "~2.0.0-dev", path = "components/datetime", default-features = false }
icu_decimal = { version = "~2.0.0-dev", path = "components/decimal", default-features = false }
icu_experimental = { version = "~0.2.0-dev", path = "components/experimental", default-features = false }
icu_list = { version = "~2.0.0-dev", path = "components/list", default-features = false }
icu_locale = { version = "~2.0.0-dev", path = "components/locale", default-features = false }
icu_normalizer = { version = "~2.0.0-dev", path = "components/normalizer", default-features = false }
icu_plurals = { version = "~2.0.0-dev", path = "components/plurals", default-features = false }
icu_properties = { version = "~2.0.0-dev", path = "components/properties", default-features = false }
icu_segmenter = { version = "~2.0.0-dev", path = "components/segmenter", default-features = false }
icu_timezone = { version = "~2.0.0-dev", path = "components/timezone", default-features = false }

# FFI
icu_capi = { version = "~1.5.0", path = "ffi/capi", default-features = false }
icu4x_ecma402 = { version = "0.8.2", path = "ffi/ecma402", default-features = false }
icu_freertos = { version = "~1.5.0", path = "ffi/freertos", default-features = false }
icu_harfbuzz = { version = "~0.2.0", path = "ffi/harfbuzz", default-features = false }
icu_capi = { version = "~2.0.0-dev", path = "ffi/capi", default-features = false }
# icu4x_ecma402 never used as a dep
# icu_freertos never used as a dep
# icu_harfbuzz never used as a dep

# Provider
icu_provider_export = { version = "~1.5.0", path = "provider/export", default-features = false }
icu_provider_source = { version = "~1.5.0", path = "provider/source", default-features = false }
icu_provider_macros = { version = "~1.5.0", path = "provider/core/macros", default-features = false }
icu_provider_adapters = { version = "~1.5.0", path = "provider/adapters", default-features = false }
icu_provider_baked = { version = "~1.5.0", path = "provider/baked", default-features = false }
icu_provider_blob = { version = "~1.5.0", path = "provider/blob", default-features = false }
icu_provider_fs = { version = "~1.5.0", path = "provider/fs", default-features = false }
icu_provider_registry = { version = "~1.5.0", path = "provider/registry", default-features = false }
icu_provider_export = { version = "~2.0.0-dev", path = "provider/export", default-features = false }
icu_provider_source = { version = "~2.0.0-dev", path = "provider/source", default-features = false }
icu_provider_macros = { version = "~2.0.0-dev", path = "provider/core/macros", default-features = false }
icu_provider_adapters = { version = "~2.0.0-dev", path = "provider/adapters", default-features = false }
icu_provider_baked = { version = "~2.0.0-dev", path = "provider/baked", default-features = false }
icu_provider_blob = { version = "~2.0.0-dev", path = "provider/blob", default-features = false }
icu_provider_fs = { version = "~2.0.0-dev", path = "provider/fs", default-features = false }
icu_provider_registry = { version = "~2.0.0-dev", path = "provider/registry", default-features = false }

# Baked data
icu_calendar_data = { version = "~1.5.0", path = "provider/data/calendar", default-features = false }
icu_casemap_data = { version = "~1.5.0", path = "provider/data/casemap", default-features = false }
icu_collator_data = { version = "~1.5.0", path = "provider/data/collator", default-features = false }
icu_datetime_data = { version = "~1.5.0", path = "provider/data/datetime", default-features = false }
icu_decimal_data = { version = "~1.5.0", path = "provider/data/decimal", default-features = false }
icu_list_data = { version = "~1.5.0", path = "provider/data/list", default-features = false }
icu_locale_data = { version = "~1.5.0", path = "provider/data/locale", default-features = false }
icu_normalizer_data = { version = "~1.5.0", path = "provider/data/normalizer", default-features = false }
icu_plurals_data = { version = "~1.5.0", path = "provider/data/plurals", default-features = false }
icu_properties_data = { version = "~1.5.0", path = "provider/data/properties", default-features = false }
icu_segmenter_data = { version = "~1.5.0", path = "provider/data/segmenter", default-features = false }
icu_timezone_data = { version = "~1.5.0", path = "provider/data/timezone", default-features = false }
icu_experimental_data = { version = "~0.1.0", path = "provider/data/experimental", default-features = false }
icu_calendar_data = { version = "~2.0.0-dev", path = "provider/data/calendar", default-features = false }
icu_casemap_data = { version = "~2.0.0-dev", path = "provider/data/casemap", default-features = false }
icu_collator_data = { version = "~2.0.0-dev", path = "provider/data/collator", default-features = false }
icu_datetime_data = { version = "~2.0.0-dev", path = "provider/data/datetime", default-features = false }
icu_decimal_data = { version = "~2.0.0-dev", path = "provider/data/decimal", default-features = false }
icu_list_data = { version = "~2.0.0-dev", path = "provider/data/list", default-features = false }
icu_locale_data = { version = "~2.0.0-dev", path = "provider/data/locale", default-features = false }
icu_normalizer_data = { version = "~2.0.0-dev", path = "provider/data/normalizer", default-features = false }
icu_plurals_data = { version = "~2.0.0-dev", path = "provider/data/plurals", default-features = false }
icu_properties_data = { version = "~2.0.0-dev", path = "provider/data/properties", default-features = false }
icu_segmenter_data = { version = "~2.0.0-dev", path = "provider/data/segmenter", default-features = false }
icu_timezone_data = { version = "~2.0.0-dev", path = "provider/data/timezone", default-features = false }
icu_experimental_data = { version = "~0.2.0-dev", path = "provider/data/experimental", default-features = false }

# Utils
bies = { version = "0.2.2", path = "utils/bies", default-features = false }
calendrical_calculations = { version = "0.1.1", path = "utils/calendrical_calculations", default-features = false }
crlify = { version = "1.0.4", path = "utils/crlify", default-features = false }
databake = { version = "0.1.8", path = "utils/databake", default-features = false }
databake = { version = "0.1.9-dev", path = "utils/databake", default-features = false }
databake-derive = { version = "0.1.8", path = "utils/databake/derive", default-features = false }
deduplicating_array = { version = "0.1.6", path = "utils/deduplicating_array", default-features = false }
fixed_decimal = { version = "0.5.6", path = "utils/fixed_decimal", default-features = false }
ixdtf = { version = "0.2.0", path = "utils/ixdtf", default-features = false }
fixed_decimal = { version = "0.6.0-dev", path = "utils/fixed_decimal", default-features = false }
ixdtf = { version = "0.3.0-dev", path = "utils/ixdtf", default-features = false }
litemap = { version = "0.7.3", path = "utils/litemap", default-features = false }
tinystr = { version = "0.7.5", path = "utils/tinystr", default-features = false }
tzif = { version = "0.2.3", path = "utils/tzif", default-features = false }
potential_utf = { version = "0.0.0", path = "utils/potential_utf", default-features = false }
writeable = { version = "0.5.5", path = "utils/writeable", default-features = false }
yoke = { version = "0.7.4", path = "utils/yoke", default-features = false }
tinystr = { version = "0.8.0-dev", path = "utils/tinystr", default-features = false }
tzif = { version = "0.3.0-dev", path = "utils/tzif", default-features = false }
potential_utf = { version = "0.1.0-dev", path = "utils/potential_utf", default-features = false }
writeable = { version = "0.5.6-dev", path = "utils/writeable", default-features = false }
yoke = { version = "0.7.5-dev", path = "utils/yoke", default-features = false }
yoke-derive = { version = "0.7.4", path = "utils/yoke/derive", default-features = false }
zerofrom = { version = "0.1.3", path = "utils/zerofrom", default-features = false }
zerofrom-derive = { version = "0.1.3", path = "utils/zerofrom/derive", default-features = false }
zerotrie = { version = "0.1.3", path = "utils/zerotrie", default-features = false }
zerovec = { version = "0.10.2", path = "utils/zerovec", default-features = false }
zerovec-derive = { version = "0.10.2", path = "utils/zerovec/derive", default-features = false }
zerotrie = { version = "0.2.0-dev", path = "utils/zerotrie", default-features = false }
zerovec = { version = "0.11.0-dev", path = "utils/zerovec", default-features = false }
zerovec-derive = { version = "0.11.0-dev", path = "utils/zerovec/derive", default-features = false }

# Tools
icu_benchmark_macros = { path = "tools/benchmark/macros" }
Expand Down
2 changes: 1 addition & 1 deletion components/collections/codepointtrie_builder/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[package]
name = "icu_codepointtrie_builder"
description = "Runtime builder for CodePointTrie"
version = "0.3.8"
version = "0.4.0-dev"
license = "Unicode-3.0"
include = [
"src/**/*",
Expand Down
2 changes: 1 addition & 1 deletion components/experimental/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[package]
name = "icu_experimental"
description = "ICU4X pre-release components under active development; all code in this crate is unstable."
version = "0.1.0"
version = "0.2.0-dev"

authors.workspace = true
categories.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion components/pattern/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[package]
name = "icu_pattern"
description = "ICU pattern utilities"
version = "0.2.0"
version = "0.3.0-dev"

authors.workspace = true
edition.workspace = true
Expand Down
1 change: 1 addition & 0 deletions documents/process/release.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Once the release checklist is complete, the assigned release driver will perform

* Land the changelog (see below)
* Note: Do this _before_ tagging the release so that it is included in the tag
* Remove all `-dev` prelease tags from `Cargo.toml`s
* Go through the prerelease checklist again, ensuring that no problems were reintroduced in the PRs that landed since the opening of the checklist. (Things like doc prettification will likely need to be rerun!)
* Release utils (see section below). Get the version bumps reviewed and checked in before releasing.
* Update ICU4X package versions as needed. Most of this can be done by updating `workspace.package` in the root `Cargo.toml` and the `workspace.dependencies` entries there. Some `icu_*` crates do not follow the ICU4X versioning scheme like `icu_codepointtrie_builder` or experimental crates.
Expand Down
2 changes: 1 addition & 1 deletion ffi/ecma402/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[package]
name = "icu4x_ecma402"
description = "ECMA-402 API functionality backed by the ICU4X library"
version = "0.8.2"
version = "0.9.0-dev"

authors.workspace = true
categories.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion provider/data/experimental/Cargo.toml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tools/make/bakeddata/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const COMPONENTS: &[(&str, &[DataMarkerInfo], &str)] = &[
(
"experimental",
icu::experimental::provider::MARKERS,
r#"version = "0.1.0""#,
r#"version = "0.2.0-dev""#,
),
];

Expand Down
3 changes: 0 additions & 3 deletions tutorials/.cargo/config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
# by cargo for any invocation inside tutorials/.

[patch.crates-io]
# Workaround for broken semver in repo
idna_adapter = { git = "https://github.com/hsivonen/idna_adapter", rev = "v1.1.0" }

# KEEP IN SYNC WITH TOP-LEVEL Cargo.toml

# ICU4X core
Expand Down
2 changes: 1 addition & 1 deletion tutorials/c-tiny/fixeddecimal/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ rust-version = "1.71.1"
path = "unused"

[dependencies]
icu_capi = { version = "1.5", default-features = false }
icu_capi = { version = "2.0.0-dev", default-features = false }
2 changes: 1 addition & 1 deletion tutorials/c-tiny/segmenter/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ rust-version = "1.71.1"
path = "unused"

[dependencies]
icu_capi = { version = "1.5", default-features = false }
icu_capi = { version = "2.0.0-dev", default-features = false }
2 changes: 1 addition & 1 deletion tutorials/c/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ name = "unused"
path = "unused"

[dependencies]
icu_capi = "1.5"
icu_capi = "2.0.0-dev"
6 changes: 3 additions & 3 deletions tutorials/cpp.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ resolver = "2"
path = "unused"

[dependencies]
icu_capi = { version = "1.4", default-features = false, features = [] }
icu_capi = { version = "2.0.0-dev", default-features = false, features = [] }
```

Some of the keys are required by the parser, but won't be used by us.
Expand All @@ -43,7 +43,7 @@ Some of the keys are required by the parser, but won't be used by us.
You can now set features by updating the `features` key in `Cargo.toml`:

```toml
icu_capi = { version = "1.4", default-features = false, features = ["default", "buffer_provider"] }
icu_capi = { version = "2.0.0-dev", default-features = false, features = ["default", "buffer_provider"] }

```

Expand Down Expand Up @@ -120,7 +120,7 @@ C++ versions beyond C++17 are supported, as are other C++ compilers.
Users wishing to use ICU4X on a `no_std` platform will need to provide an allocator and a panic hook in order to build a linkable library. The `icu_capi` crate can provide a looping panic handler, and a `malloc`-backed allocator, under the `looping_panic_handler` and `libc_alloc` features, respectively.

```toml
icu_capi = { version = "1.4", default-features = false, features = ["default_components", "buffer_provider", "looping_panic_handler", "libc_alloc"] }
icu_capi = { version = "2.0.0-dev", default-features = false, features = ["default_components", "buffer_provider", "looping_panic_handler", "libc_alloc"] }

```

Expand Down
4 changes: 2 additions & 2 deletions tutorials/cpp/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ name = "unused"
path = "unused"

[dependencies]
icu_capi = { version = "1.5", features = ["provider_fs", "experimental"] }
icu_provider = { version = "1.5", features = ["deserialize_json"] }
icu_capi = { version = "2.0.0-dev", features = ["provider_fs", "experimental"] }
icu_provider = { version = "2.0.0-dev", features = ["deserialize_json"] }
6 changes: 3 additions & 3 deletions tutorials/gn/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ edition = "2021"

[dependencies]
# Note: Only dependencies that are explicitly listed here are given public GN build targets.
icu_capi = { version = "1.0", default-features = false, features = ["default_components"] }
icu = { version = "1.0", default-features = false }
icu_provider = { version = "1.0" }
icu_capi = { version = "2.0.0-dev", default-features = false, features = ["default_components"] }
icu = { version = "2.0.0-dev", default-features = false }
icu_provider = { version = "2.0.0-dev" }

[gn.package.proc-macro2."1.0.83"]
rustflags = ["--cfg=use_proc_macro", "--cfg=wrap_proc_macro", "--cfg=proc_macro_span"]
Expand Down
2 changes: 1 addition & 1 deletion tutorials/js-tiny/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ rust-version = "1.71.1"
path = "unused"

[dependencies]
icu_capi = "1.5"
icu_capi = "2.0.0-dev"
22 changes: 11 additions & 11 deletions tutorials/rust.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The most basic Cargo.toml to get you off the ground is the following:

```toml
[dependencies]
icu = "1.5"
icu = "2.0.0-dev"
```

In your main.rs, you can use all stable ICU4X components for the recommended set of locales, which get compiled into the library.
Expand All @@ -33,7 +33,7 @@ Experimental modules are published in a separate `icu_experimental` crate:

```toml
[dependencies]
icu = { version = "1.5", features = ["experimental"] }
icu = { version = "2.0.0-dev", features = ["experimental"] }
```

In your main.rs, you can now use e.g. the `icu_experimental::displaynames` module.
Expand All @@ -46,8 +46,8 @@ If you wish to generate your own data in blob format and pass it into ICU4X, ena

```toml
[dependencies]
icu = { version = "1.5", features = ["serde"] }
icu_provider_blob = "1.5"
icu = { version = "2.0.0-dev", features = ["serde"] }
icu_provider_blob = "2.0.0-dev"
```

To learn about building ICU4X data, including whether to check in the data blob file to your repository, see [data_management.md](./data_management.md).
Expand All @@ -60,7 +60,7 @@ If you wish to share ICU4X objects between threads, you must enable the `"sync"`

```toml
[dependencies]
icu = { version = "1.5", features = ["sync"] }
icu = { version = "2.0.0-dev", features = ["sync"] }
```

You can now use most ICU4X types when `Send + Sync` are required, such as when sharing across threads.
Expand All @@ -73,16 +73,16 @@ If you wish to use data generation in a `build.rs` script, you need to manually

```toml
[dependencies]
icu = { version = "1.5", default-features = false } # turn off compiled_data
icu_provider = "1.5" # for databake
icu_provider_baked = "1.5" # for databake
icu = { version = "2.0.0-dev", default-features = false } # turn off compiled_data
icu_provider = "2.0.0-dev" # for databake
icu_provider_baked = "2.0.0-dev" # for databake
zerovec = "0.9" # for databake

# for build.rs:
[build-dependencies]
icu = "1.5"
icu_provider_export = "1.5"
icu_provider_source = "1.5"
icu = "2.0.0-dev"
icu_provider_export = "2.0.0-dev"
icu_provider_source = "2.0.0-dev"
```

This example has an additional section for auto-generating the data in build.rs. In your build.rs, invoke the ICU4X Datagen API with the set of markers you require. Don't worry; if using databake, you will get a compiler error if you don't specify enough markers.
Expand Down
Loading

0 comments on commit 7a2aa53

Please sign in to comment.