Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update icu74 #300

Merged
merged 1 commit into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
icu_version: [63, 71, 72, 73]
icu_version: [63, 72, 73, 74]
steps:
- uses: actions/checkout@v2
- name: 'Test ICU version ${{ matrix.icu_version }}'
Expand All @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
icu_version: [71, 72, 73]
icu_version: [72, 73, 74]
feature_set:
- "renaming,icu_version_in_env,icu_version_64_plus,icu_version_67_plus,icu_version_68_plus"
- "renaming,icu_version_64_plus,icu_version_67_plus,icu_version_68_plus,icu_config,use-bindgen"
Expand Down Expand Up @@ -53,7 +53,9 @@ jobs:
runs-on: ${{ matrix.runs-on }}
strategy:
matrix:
runs-on: [ubuntu-latest, macos-latest]
# TODO: #301: re-enable.
# runs-on: [ubuntu-latest, macos-latest]
runs-on: [ubuntu-latest]
steps:
- uses: actions/checkout@v2
- if: matrix.runs-on == 'macos-latest'
Expand Down
14 changes: 8 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ endif
# make USED_BUILDENV_VERSION=whatever-you-want docker-test
#
# NOTE: This version number is completely independent of the crate version.
USED_BUILDENV_VERSION ?= 1.73.1
USED_BUILDENV_VERSION ?= 1.74.0

CARGO_FEATURE_VERSION :=

Expand Down Expand Up @@ -55,7 +55,7 @@ CARGO_TARGET_DIR := ${TMP}/rust_icu-${LOGNAME}-target
# Pass different values for DOCKER_TEST_ENV and DOCKER_TEST_CARGO_TEST_ARGS to
# test different configurations. This is useful in Travis CI matrix tests, for
# example.
RUST_ICU_MAJOR_VERSION_NUMBER ?= 73
RUST_ICU_MAJOR_VERSION_NUMBER ?= 74
DOCKER_TEST_ENV ?= rust_icu_testenv-${RUST_ICU_MAJOR_VERSION_NUMBER}
DOCKER_TEST_CARGO_TEST_ARGS ?=
docker-test:
Expand Down Expand Up @@ -106,7 +106,8 @@ static-bindgen: \
static-bindgen-63.stamp \
static-bindgen-71.stamp \
static-bindgen-72.stamp \
static-bindgen-73.stamp
static-bindgen-73.stamp \
static-bindgen-74.stamp
.PHONY: static-bindgen


Expand All @@ -131,7 +132,8 @@ static-bindgen-special-%.stamp: rust_icu_sys/bindgen_special/run_bindgen.sh
# and any versions that do not have a lib.rs in rust_icu_sys/bindgen.
static-bindgen-special: \
static-bindgen-special-72.stamp \
static-bindgen-special-73.stamp
static-bindgen-special-73.stamp \
static-bindgen-special-74.stamp
.PHONY: static-bindgen-special

# Builds and pushes the build environment containers. You would not normally
Expand Down Expand Up @@ -229,8 +231,8 @@ publish: publish.stamp
# 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 ?= 4.2.3
UPREV_NEW_VERSION ?= 4.2.4
UPREV_OLD_VERSION ?= 5.0.0
UPREV_NEW_VERSION ?= 5.1.0
define uprevfn
( \
cd $(1) && \
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ The compatibility guarantee is as follows:
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 69.1 | ICU 70.1 | ICU 71.1 | ICU 72.1 | ICU 73.1 |
`rust_icu` version | ICU 63.x | ICU 70.1 | ICU 71.1 | ICU 72.1 | ICU 73.1 | ICU 74.1 |
-------------------- | -------- | -------- | -------- | -------- | -------- | -------- |
2.0 | ✅ | ✅ | ✅ | ✅ | | |
3.0 | ✅ | | ✅ | ✅ | ✅ | |
4.0 | ✅ | | | ✅ | ✅ | ✅ |
3.0 | ✅ | ✅ | ✅ | ✅ | | |
4.0 | ✅ | | ✅ | ✅ | ✅ | |
5.0 | ✅ | | | ✅ | ✅ | ✅ |

# 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 = "4.2.3"
version = "5.0.0"

description = """
Rust implementation of type traits to support ECMA 402 specification in Rust.
Expand Down
34 changes: 17 additions & 17 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 = "4.2.3"
version = "5.0.0"

description = """
Native bindings to the ICU4C library from Unicode.
Expand All @@ -17,22 +17,22 @@ keywords = ["icu", "unicode", "i18n", "l10n"]
anyhow = "1.0.25"
log = "0.4.6"
paste = "1.0"
rust_icu_common = { path = "../rust_icu_common", version = "4.2.3", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "4.2.3", default-features = false }
rust_icu_ubrk = { path = "../rust_icu_ubrk", version = "4.2.3", default-features = false }
rust_icu_ucal = { path = "../rust_icu_ucal", version = "4.2.3", default-features = false }
rust_icu_ucol = { path = "../rust_icu_ucol", version = "4.2.3", default-features = false }
rust_icu_ucsdet = { path = "../rust_icu_ucsdet", version = "4.2.3", default-features = false }
rust_icu_udat = { path = "../rust_icu_udat", version = "4.2.3", default-features = false }
rust_icu_udata = { path = "../rust_icu_udata", version = "4.2.3", default-features = false }
rust_icu_uenum = { path = "../rust_icu_uenum", version = "4.2.3", default-features = false }
rust_icu_ulistformatter = { path = "../rust_icu_ulistformatter", version = "4.2.3", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "4.2.3", default-features = false }
rust_icu_umsg = { path = "../rust_icu_umsg", version = "4.2.3", default-features = false }
rust_icu_unorm2 = { path = "../rust_icu_unorm2", version = "4.2.3", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "4.2.3", default-features = false }
rust_icu_utext = { path = "../rust_icu_utext", version = "4.2.3", default-features = false }
rust_icu_utrans = { path = "../rust_icu_utrans", version = "4.2.3", default-features = false }
rust_icu_common = { path = "../rust_icu_common", version = "5.0.0", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "5.0.0", default-features = false }
rust_icu_ubrk = { path = "../rust_icu_ubrk", version = "5.0.0", default-features = false }
rust_icu_ucal = { path = "../rust_icu_ucal", version = "5.0.0", default-features = false }
rust_icu_ucol = { path = "../rust_icu_ucol", version = "5.0.0", default-features = false }
rust_icu_ucsdet = { path = "../rust_icu_ucsdet", version = "5.0.0", default-features = false }
rust_icu_udat = { path = "../rust_icu_udat", version = "5.0.0", default-features = false }
rust_icu_udata = { path = "../rust_icu_udata", version = "5.0.0", default-features = false }
rust_icu_uenum = { path = "../rust_icu_uenum", version = "5.0.0", default-features = false }
rust_icu_ulistformatter = { path = "../rust_icu_ulistformatter", version = "5.0.0", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "5.0.0", default-features = false }
rust_icu_umsg = { path = "../rust_icu_umsg", version = "5.0.0", default-features = false }
rust_icu_unorm2 = { path = "../rust_icu_unorm2", version = "5.0.0", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "5.0.0", default-features = false }
rust_icu_utext = { path = "../rust_icu_utext", version = "5.0.0", default-features = false }
rust_icu_utrans = { path = "../rust_icu_utrans", version = "5.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 = "4.2.3"
version = "5.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 = "4.2.3", default-features = false}
rust_icu_sys = { path = "../rust_icu_sys", version = "5.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 = "4.2.3"
version = "5.0.0"

description = """
ECMA 402 standard implementation in Rust.
"""
[dependencies]
anyhow = "1.0.25"
ecma402_traits = { path = "../ecma402_traits", version = "4.2.3" }
ecma402_traits = { path = "../ecma402_traits", version = "5.0.0" }
log = "0.4.6"
paste = "1.0"
rust_icu_common = { path = "../rust_icu_common", version = "4.2.3", default-features = false }
rust_icu_udat = { path = "../rust_icu_udat", version = "4.2.3", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "4.2.3", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "4.2.3", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "4.2.3", default-features = false }
rust_icu_ulistformatter = { path = "../rust_icu_ulistformatter", version = "4.2.3", default-features = false }
rust_icu_upluralrules = { path = "../rust_icu_upluralrules", version = "4.2.3", default-features = false }
rust_icu_unum = { path = "../rust_icu_unum", version = "4.2.3", default-features = false }
rust_icu_unumberformatter = { path = "../rust_icu_unumberformatter", version = "4.2.3", default-features = false }
rust_icu_common = { path = "../rust_icu_common", version = "5.0.0", default-features = false }
rust_icu_udat = { path = "../rust_icu_udat", version = "5.0.0", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "5.0.0", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "5.0.0", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "5.0.0", default-features = false }
rust_icu_ulistformatter = { path = "../rust_icu_ulistformatter", version = "5.0.0", default-features = false }
rust_icu_upluralrules = { path = "../rust_icu_upluralrules", version = "5.0.0", default-features = false }
rust_icu_unum = { path = "../rust_icu_unum", version = "5.0.0", default-features = false }
rust_icu_unumberformatter = { path = "../rust_icu_unumberformatter", version = "5.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 = "4.2.3"
version = "5.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 = "4.2.3", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "4.2.3", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "4.2.3", default-features = false }
rust_icu_umsg = { path = "../rust_icu_umsg", version = "4.2.3", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "4.2.3", default-features = false }
rust_icu_common = { path = "../rust_icu_common", version = "5.0.0", default-features = false }
rust_icu_sys = { path = "../rust_icu_sys", version = "5.0.0", default-features = false }
rust_icu_uloc = { path = "../rust_icu_uloc", version = "5.0.0", default-features = false }
rust_icu_umsg = { path = "../rust_icu_umsg", version = "5.0.0", default-features = false }
rust_icu_ustring = { path = "../rust_icu_ustring", version = "5.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 = "4.2.3"
version = "5.0.0"
authors = ["Google Inc."]
license = "Apache-2.0"
readme = "README.md"
Expand Down
Loading
Loading