Skip to content

Commit

Permalink
Uprev rust_icu to 2.0.0
Browse files Browse the repository at this point in the history
The uprev to 2.0.0 is due to the drop for support of ICU 67 and
the introduction of ICU 70.

Issue #223
  • Loading branch information
filmil committed Jan 11, 2022
1 parent 9feaef5 commit 5634572
Show file tree
Hide file tree
Showing 28 changed files with 147 additions and 158 deletions.
14 changes: 1 addition & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
icu_version: [63, 67, 68, 69, 70]
icu_version: [63, 68, 69, 70]
steps:
- uses: actions/checkout@v2
- name: 'Test ICU version ${{ matrix.icu_version }}'
Expand All @@ -26,18 +26,6 @@ jobs:
- uses: actions/checkout@v2
- name: 'Test ICU version ${{ matrix.icu_version }}'
run: 'make DOCKER_TEST_ENV=rust_icu_testenv-${{ matrix.icu_version }} RUST_ICU_MAJOR_VERSION_NUMBER=${{ matrix.icu_version }} DOCKER_TEST_CARGO_TEST_ARGS="--no-default-features --features ${{ matrix.feature_set }}" docker-test'
test-67-plus-features:
runs-on: ubuntu-latest
strategy:
matrix:
icu_version: [67]
feature_set:
- "renaming,icu_version_in_env,icu_version_64_plus,icu_version_67_plus,icu_version_69_max"
- "renaming,icu_version_64_plus,icu_version_67_plus,icu_config,use-bindgen,icu_version_69_max"
steps:
- uses: actions/checkout@v2
- name: Test ICU version ${{ matrix.icu_version }}
run: 'make DOCKER_TEST_ENV=rust_icu_testenv-${{ matrix.icu_version }} RUST_ICU_MAJOR_VERSION_NUMBER=${{ matrix.icu_version }} DOCKER_TEST_CARGO_TEST_ARGS="--no-default-features --features ${{ matrix.feature_set }}" docker-test'
test-69-plus-features:
runs-on: ubuntu-latest
strategy:
Expand Down
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ publish-rust_icu: publish-rust_icu_sys
$(call publishfn,rust_icu_unumberformatter)
$(call publishfn,rust_icu_unorm2)
$(call publishfn,rust_icu_uchar)
$(call publishfn,rust_icu_ucnv)
.PHONY: publish-rust_icu

publish-ecma402_traits:
Expand All @@ -165,8 +166,8 @@ publish: publish-rust_icu publish-rust_icu_ecma402
# A helper to up-rev the cargo crate versions.
# NOTE: The cargo crate version number is completely independent of the Docker
# build environment version number.
UPREV_OLD_VERSION ?= 1.0.3
UPREV_NEW_VERSION ?= 1.0.4
UPREV_OLD_VERSION ?= 2.0.0
UPREV_NEW_VERSION ?= 2.0.1
define uprevfn
( \
cd $(1) && \
Expand Down Expand Up @@ -199,6 +200,7 @@ uprev:
$(call uprevfn,ecma402_traits)
$(call uprevfn,rust_icu_unorm2)
$(call uprevfn,rust_icu_uchar)
$(call uprevfn,rust_icu_ucnv)
.PHONY: uprev

cov:
Expand Down
33 changes: 16 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Item | Description
-------------- | -----------
ICU 63, 67..69 | [![Test status](https://github.com/google/rust_icu/workflows/Test/badge.svg)](https://github.com/google/rust_icu/workflows/Test/badge.svg)
ICU 63, 68..70 | [![Test status](https://github.com/google/rust_icu/workflows/Test/badge.svg)](https://github.com/google/rust_icu/workflows/Test/badge.svg)
Source | https://github.com/google/rust_icu
README | https://github.com/google/rust_icu/blob/main/README.md
Coverage | [View report](/coverage/report.md)
Expand Down Expand Up @@ -34,8 +34,8 @@ https://github.com/google/rust_icu.
confirms that ICU support in rust is spotty, so having a functional wrapper
helps advance the state of the art.

* Projects such as [Fuchsia OS](https://fuchsia.dev) already depend on ICU,
and having rust bindings allow for an easy way to use Unicode algorithms
* Projects such as [Fuchsia](https://fuchsia.dev) already depend on ICU,
and having rust bindings allows for an easy way to use Unicode algorithms
without taking on more dependencies.

* Cooperation on the interface with projects such as the
Expand Down Expand Up @@ -108,23 +108,22 @@ The limitations we know of today are as follows:

The compatibility guarantee is as follows:

1. Up to 3 minor releases of `rust_icu` are tested for each major release
2. Automated tests are executed for last three major ICU library versions in all
1. Automated tests are executed for last three major ICU library versions in all
feature combinations of interest.
3. Automated tests are executed for the ICU library version in use by the docs.rs
2. Automated tests are executed for the ICU library version in use by the docs.rs
system (so the documentation could be built).

`rust_icu` version | ICU 63.x | ICU 64.2 | ICU 65.1 | ICU 66.0.1 | ICU 67.1 | ICU 68.1 | ICU 69.1
-------------------- | -------- | -------- | -------- | ---------- | -------- | -------- | --------
0.2 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
0.3 | | | | ✅ | ✅ | ✅ |
0.4 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
0.5 | | | | | ✅ | ✅ | ✅
--- | --- | --- | --- | --- | --- | --- | ✅
1.0 | ✅ | | | | ✅ | ✅ | ✅

> Prior to a 1.0.0 release, API versions that only differ in the patch version
> number (0.x.**y**) only should be compatible.
`rust_icu` version | ICU 63.x | ICU 67.1 | ICU 68.1 | ICU 69.1 | ICU 70.1
-------------------- | -------- | -------- | -------- | -------- | -------
0.5 | ✅ | ✅ | ✅ | ✅ |
--- | --- | --- | --- | --- |
1.0 | ✅ | ✅ | ✅ | ✅ |
--- | --- | --- | --- | --- |
2.0 | | | | | ✅

> If you must use a 0.x relase, please use the release 0.5. Else, upgrade to
> 1.0 since 1.0 supports the same ICU versions as 0.5. If you have an option
> to do so, upgrade to the latest release as soon as able.
# Features

Expand Down
2 changes: 1 addition & 1 deletion ecma402_traits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "Apache-2.0"
name = "ecma402_traits"
readme = "README.md"
repository = "https://github.com/google/rust_icu"
version = "1.0.3"
version = "2.0.0"

description = """
Rust implementation of type traits to support ECMA 402 specification in Rust.
Expand Down
32 changes: 16 additions & 16 deletions rust_icu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license = "Apache-2.0"
name = "rust_icu"
readme = "README.md"
repository = "https://github.com/google/rust_icu"
version = "1.0.3"
version = "2.0.0"

description = """
Native bindings to the ICU4C library from Unicode.
Expand All @@ -17,21 +17,21 @@ keywords = ["icu", "unicode", "i18n", "l10n"]
anyhow = "1.0.25"
log = "0.4.6"
paste = "1.0"
rust_icu_common = { path = "../rust_icu_common", version = "1.0.3", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "1.0.3", default-features = false }
rust_icu_ubrk = { path = "../rust_icu_ubrk", version = "1.0.3", default-features = false }
rust_icu_ucal = { path = "../rust_icu_ucal", version = "1.0.3", default-features = false }
rust_icu_ucol = { path = "../rust_icu_ucol", version = "1.0.3", default-features = false }
rust_icu_udat = { path = "../rust_icu_udat", version = "1.0.3", default-features = false }
rust_icu_udata = { path = "../rust_icu_udata", version = "1.0.3", default-features = false }
rust_icu_uenum = { path = "../rust_icu_uenum", version = "1.0.3", default-features = false }
rust_icu_ulistformatter = { path = "../rust_icu_ulistformatter", version = "1.0.3", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "1.0.3", default-features = false }
rust_icu_umsg = { path = "../rust_icu_umsg", version = "1.0.3", default-features = false }
rust_icu_unorm2 = { path = "../rust_icu_unorm2", version = "1.0.3", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "1.0.3", default-features = false }
rust_icu_utext = { path = "../rust_icu_utext", version = "1.0.3", default-features = false }
rust_icu_utrans = { path = "../rust_icu_utrans", version = "1.0.3", default-features = false }
rust_icu_common = { path = "../rust_icu_common", version = "2.0.0", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "2.0.0", default-features = false }
rust_icu_ubrk = { path = "../rust_icu_ubrk", version = "2.0.0", default-features = false }
rust_icu_ucal = { path = "../rust_icu_ucal", version = "2.0.0", default-features = false }
rust_icu_ucol = { path = "../rust_icu_ucol", version = "2.0.0", default-features = false }
rust_icu_udat = { path = "../rust_icu_udat", version = "2.0.0", default-features = false }
rust_icu_udata = { path = "../rust_icu_udata", version = "2.0.0", default-features = false }
rust_icu_uenum = { path = "../rust_icu_uenum", version = "2.0.0", default-features = false }
rust_icu_ulistformatter = { path = "../rust_icu_ulistformatter", version = "2.0.0", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "2.0.0", default-features = false }
rust_icu_umsg = { path = "../rust_icu_umsg", version = "2.0.0", default-features = false }
rust_icu_unorm2 = { path = "../rust_icu_unorm2", version = "2.0.0", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "2.0.0", default-features = false }
rust_icu_utext = { path = "../rust_icu_utext", version = "2.0.0", default-features = false }
rust_icu_utrans = { path = "../rust_icu_utrans", version = "2.0.0", default-features = false }
thiserror = "1.0.9"

# See the feature description in ../rust_icu_sys/Cargo.toml for details.
Expand Down
4 changes: 2 additions & 2 deletions rust_icu_common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
edition = "2018"
name = "rust_icu_common"
version = "1.0.3"
version = "2.0.0"
authors = ["Google Inc."]
license = "Apache-2.0"
readme = "README.md"
Expand All @@ -19,7 +19,7 @@ keywords = ["icu", "unicode", "i18n", "l10n"]
anyhow = "1.0.25"
thiserror = "1.0.9"

rust_icu_sys = { path = "../rust_icu_sys", version = "1.0.3", default-features = false}
rust_icu_sys = { path = "../rust_icu_sys", version = "2.0.0", default-features = false}

# See the feature description in ../rust_icu_sys/Cargo.toml for details.
[features]
Expand Down
22 changes: 11 additions & 11 deletions rust_icu_ecma402/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ license = "Apache-2.0"
name = "rust_icu_ecma402"
readme = "README.md"
repository = "https://github.com/google/rust_icu"
version = "1.0.3"
version = "2.0.0"

description = """
ECMA 402 standard implementation in Rust.
"""
[dependencies]
anyhow = "1.0.25"
ecma402_traits = { path = "../ecma402_traits", version = "1.0.3" }
ecma402_traits = { path = "../ecma402_traits", version = "2.0.0" }
log = "0.4.6"
paste = "1.0"
rust_icu_common = { path = "../rust_icu_common", version = "1.0.3", default-features = false }
rust_icu_udat = { path = "../rust_icu_udat", version = "1.0.3", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "1.0.3", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "1.0.3", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "1.0.3", default-features = false }
rust_icu_ulistformatter = { path = "../rust_icu_ulistformatter", version = "1.0.3", default-features = false }
rust_icu_upluralrules = { path = "../rust_icu_upluralrules", version = "1.0.3", default-features = false }
rust_icu_unum = { path = "../rust_icu_unum", version = "1.0.3", default-features = false }
rust_icu_unumberformatter = { path = "../rust_icu_unumberformatter", version = "1.0.3", default-features = false }
rust_icu_common = { path = "../rust_icu_common", version = "2.0.0", default-features = false }
rust_icu_udat = { path = "../rust_icu_udat", version = "2.0.0", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "2.0.0", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "2.0.0", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "2.0.0", default-features = false }
rust_icu_ulistformatter = { path = "../rust_icu_ulistformatter", version = "2.0.0", default-features = false }
rust_icu_upluralrules = { path = "../rust_icu_upluralrules", version = "2.0.0", default-features = false }
rust_icu_unum = { path = "../rust_icu_unum", version = "2.0.0", default-features = false }
rust_icu_unumberformatter = { path = "../rust_icu_unumberformatter", version = "2.0.0", default-features = false }

[dev-dependencies]
anyhow = "1.0.25"
Expand Down
12 changes: 6 additions & 6 deletions rust_icu_intl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license = "Apache-2.0"
name = "rust_icu_intl"
readme = "README.md"
repository = "https://github.com/google/rust_icu"
version = "1.0.3"
version = "2.0.0"

description = """
Native bindings to the ICU4C library from Unicode.
Expand All @@ -17,11 +17,11 @@ umsg.h
anyhow = "1.0.25"
log = "0.4.6"
paste = "1.0"
rust_icu_common = { path = "../rust_icu_common", version = "1.0.3", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "1.0.3", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "1.0.3", default-features = false }
rust_icu_umsg = { path = "../rust_icu_umsg", version = "1.0.3", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "1.0.3", default-features = false }
rust_icu_common = { path = "../rust_icu_common", version = "2.0.0", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "2.0.0", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "2.0.0", default-features = false }
rust_icu_umsg = { path = "../rust_icu_umsg", version = "2.0.0", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "2.0.0", default-features = false }
thiserror = "1.0.9"

# See the feature description in ../rust_icu_sys/Cargo.toml for details.
Expand Down
2 changes: 1 addition & 1 deletion rust_icu_sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rust_icu_sys"
version = "1.0.3"
version = "2.0.0"
authors = ["Google Inc."]
license = "Apache-2.0"
readme = "README.md"
Expand Down
10 changes: 5 additions & 5 deletions rust_icu_ubrk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "Apache-2.0"
name = "rust_icu_ubrk"
readme = "README.md"
repository = "https://github.com/google/rust_icu"
version = "1.0.3"
version = "2.0.0"

description = """
Native bindings to the ICU4C library from Unicode.
Expand All @@ -17,10 +17,10 @@ Native bindings to the ICU4C library from Unicode.
[dependencies]
log = "0.4.6"
paste = "1.0"
rust_icu_common = { path = "../rust_icu_common", version = "1.0.3", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "1.0.3", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "1.0.3", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "1.0.3", default-features = false }
rust_icu_common = { path = "../rust_icu_common", version = "2.0.0", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "2.0.0", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "2.0.0", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "2.0.0", default-features = false }

[dev-dependencies]
anyhow = "1.0.25"
Expand Down
10 changes: 5 additions & 5 deletions rust_icu_ucal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license = "Apache-2.0"
name = "rust_icu_ucal"
readme = "README.md"
repository = "https://github.com/google/rust_icu"
version = "1.0.3"
version = "2.0.0"

description = """
Native bindings to the ICU4C library from Unicode.
Expand All @@ -18,10 +18,10 @@ keywords = ["icu", "unicode", "i18n", "l10n"]
[dependencies]
log = "0.4.6"
paste = "1.0"
rust_icu_common = { path = "../rust_icu_common", version = "1.0.3", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "1.0.3", default-features = false }
rust_icu_uenum = { path = "../rust_icu_uenum", version = "1.0.3", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "1.0.3", default-features = false }
rust_icu_common = { path = "../rust_icu_common", version = "2.0.0", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "2.0.0", default-features = false }
rust_icu_uenum = { path = "../rust_icu_uenum", version = "2.0.0", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "2.0.0", default-features = false }

[dev-dependencies]
regex = "1"
Expand Down
6 changes: 3 additions & 3 deletions rust_icu_uchar/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license = "Apache-2.0"
name = "rust_icu_uchar"
readme = "README.md"
repository = "https://github.com/google/rust_icu"
version = "1.0.3"
version = "2.0.0"

description = """
Native bindings to the ICU4C library from Unicode.
Expand All @@ -18,8 +18,8 @@ keywords = ["icu", "unicode", "i18n", "l10n"]
[dependencies]
log = "0.4.6"
paste = "1.0"
rust_icu_common = { path = "../rust_icu_common", version = "1.0.3", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "1.0.3", default-features = false }
rust_icu_common = { path = "../rust_icu_common", version = "2.0.0", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "2.0.0", default-features = false }

# See the feature description in ../rust_icu_sys/Cargo.toml for details.
[features]
Expand Down
6 changes: 3 additions & 3 deletions rust_icu_ucnv/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license = "Apache-2.0"
name = "rust_icu_ucnv"
readme = "README.md"
repository = "https://github.com/google/rust_icu"
version = "1.0.3"
version = "2.0.0"

description = """
Native bindings to the ICU4C library from Unicode.
Expand All @@ -18,8 +18,8 @@ keywords = ["icu", "unicode", "i18n", "l10n"]
[dependencies]
log = "0.4.6"
paste = "1.0"
rust_icu_common = { path = "../rust_icu_common", version = "1.0.3", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "1.0.3", default-features = false }
rust_icu_common = { path = "../rust_icu_common", version = "2.0.0", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "2.0.0", default-features = false }

# See the feature description in ../rust_icu_sys/Cargo.toml for details.
[features]
Expand Down
10 changes: 5 additions & 5 deletions rust_icu_ucol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license = "Apache-2.0"
name = "rust_icu_ucol"
readme = "README.md"
repository = "https://github.com/google/rust_icu"
version = "1.0.3"
version = "2.0.0"
keywords = ["icu", "unicode", "i18n", "l10n"]

description = """
Expand All @@ -17,10 +17,10 @@ Native bindings to the ICU4C library from Unicode.
[dependencies]
log = "0.4.6"
paste = "1.0"
rust_icu_common = { path = "../rust_icu_common", version = "1.0.3", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "1.0.3", default-features = false }
rust_icu_uenum = { path = "../rust_icu_uenum", version = "1.0.3", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "1.0.3", default-features = false }
rust_icu_common = { path = "../rust_icu_common", version = "2.0.0", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "2.0.0", default-features = false }
rust_icu_uenum = { path = "../rust_icu_uenum", version = "2.0.0", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "2.0.0", default-features = false }
anyhow = "1.0.25"

[dev-dependencies]
Expand Down
14 changes: 7 additions & 7 deletions rust_icu_udat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "Apache-2.0"
name = "rust_icu_udat"
readme = "README.md"
repository = "https://github.com/google/rust_icu"
version = "1.0.3"
version = "2.0.0"

description = """
Native bindings to the ICU4C library from Unicode.
Expand All @@ -19,12 +19,12 @@ keywords = ["icu", "unicode", "i18n", "l10n"]
[dependencies]
log = "0.4.6"
paste = "1.0"
rust_icu_common = { path = "../rust_icu_common", version = "1.0.3", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "1.0.3", default-features = false }
rust_icu_ucal = { path = "../rust_icu_ucal", version = "1.0.3", default-features = false }
rust_icu_uenum = { path = "../rust_icu_uenum", version = "1.0.3", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "1.0.3", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "1.0.3", default-features = false }
rust_icu_common = { path = "../rust_icu_common", version = "2.0.0", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "2.0.0", default-features = false }
rust_icu_ucal = { path = "../rust_icu_ucal", version = "2.0.0", default-features = false }
rust_icu_uenum = { path = "../rust_icu_uenum", version = "2.0.0", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "2.0.0", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "2.0.0", default-features = false }

[dev-dependencies]
regex = "1"
Expand Down
Loading

0 comments on commit 5634572

Please sign in to comment.