Skip to content

Commit 00c7bc8

Browse files
filmilfilmil
committed
feat: update rust_icu to support ICU v74
Issues: google#301 Fixes: google#289, google#288
1 parent e0c8e69 commit 00c7bc8

File tree

30 files changed

+7129
-142
lines changed

30 files changed

+7129
-142
lines changed

‎.github/workflows/test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ jobs:
5353
runs-on: ${{ matrix.runs-on }}
5454
strategy:
5555
matrix:
56-
runs-on: [ubuntu-latest, macos-latest]
56+
# TODO: #301: re-enable.
57+
# runs-on: [ubuntu-latest, macos-latest]
58+
runs-on: [ubuntu-latest]
5759
steps:
5860
- uses: actions/checkout@v2
5961
- if: matrix.runs-on == 'macos-latest'

‎Makefile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ endif
2323
# make USED_BUILDENV_VERSION=whatever-you-want docker-test
2424
#
2525
# NOTE: This version number is completely independent of the crate version.
26-
USED_BUILDENV_VERSION ?= 1.73.1
26+
USED_BUILDENV_VERSION ?= 1.74.0
2727

2828
CARGO_FEATURE_VERSION :=
2929

@@ -55,7 +55,7 @@ CARGO_TARGET_DIR := ${TMP}/rust_icu-${LOGNAME}-target
5555
# Pass different values for DOCKER_TEST_ENV and DOCKER_TEST_CARGO_TEST_ARGS to
5656
# test different configurations. This is useful in Travis CI matrix tests, for
5757
# example.
58-
RUST_ICU_MAJOR_VERSION_NUMBER ?= 73
58+
RUST_ICU_MAJOR_VERSION_NUMBER ?= 74
5959
DOCKER_TEST_ENV ?= rust_icu_testenv-${RUST_ICU_MAJOR_VERSION_NUMBER}
6060
DOCKER_TEST_CARGO_TEST_ARGS ?=
6161
docker-test:
@@ -106,7 +106,8 @@ static-bindgen: \
106106
static-bindgen-63.stamp \
107107
static-bindgen-71.stamp \
108108
static-bindgen-72.stamp \
109-
static-bindgen-73.stamp
109+
static-bindgen-73.stamp \
110+
static-bindgen-74.stamp
110111
.PHONY: static-bindgen
111112

112113

@@ -131,7 +132,8 @@ static-bindgen-special-%.stamp: rust_icu_sys/bindgen_special/run_bindgen.sh
131132
# and any versions that do not have a lib.rs in rust_icu_sys/bindgen.
132133
static-bindgen-special: \
133134
static-bindgen-special-72.stamp \
134-
static-bindgen-special-73.stamp
135+
static-bindgen-special-73.stamp \
136+
static-bindgen-special-74.stamp
135137
.PHONY: static-bindgen-special
136138

137139
# Builds and pushes the build environment containers. You would not normally
@@ -229,8 +231,8 @@ publish: publish.stamp
229231
# A helper to up-rev the cargo crate versions.
230232
# NOTE: The cargo crate version number is completely independent of the Docker
231233
# build environment version number.
232-
UPREV_OLD_VERSION ?= 4.2.3
233-
UPREV_NEW_VERSION ?= 4.2.4
234+
UPREV_OLD_VERSION ?= 5.0.0
235+
UPREV_NEW_VERSION ?= 5.1.0
234236
define uprevfn
235237
( \
236238
cd $(1) && \

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ The compatibility guarantee is as follows:
113113
2. Automated tests are executed for the ICU library version in use by the docs.rs
114114
system (so the documentation could be built).
115115

116-
`rust_icu` version | ICU 63.x | ICU 69.1 | ICU 70.1 | ICU 71.1 | ICU 72.1 | ICU 73.1 |
116+
`rust_icu` version | ICU 63.x | ICU 70.1 | ICU 71.1 | ICU 72.1 | ICU 73.1 | ICU 74.1 |
117117
-------------------- | -------- | -------- | -------- | -------- | -------- | -------- |
118-
2.0 | ✅ | ✅ | ✅ | ✅ | | |
119-
3.0 | ✅ | | ✅ | ✅ | ✅ | |
120-
4.0 | ✅ | | | ✅ | ✅ | ✅ |
118+
3.0 | ✅ | ✅ | ✅ | ✅ | | |
119+
4.0 | ✅ | | ✅ | ✅ | ✅ | |
120+
5.0 | ✅ | | | ✅ | ✅ | ✅ |
121121

122122
# Features
123123

‎ecma402_traits/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license = "Apache-2.0"
66
name = "ecma402_traits"
77
readme = "README.md"
88
repository = "https://github.com/google/rust_icu"
9-
version = "4.2.3"
9+
version = "5.0.0"
1010

1111
description = """
1212
Rust implementation of type traits to support ECMA 402 specification in Rust.

‎rust_icu/Cargo.toml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ license = "Apache-2.0"
55
name = "rust_icu"
66
readme = "README.md"
77
repository = "https://github.com/google/rust_icu"
8-
version = "4.2.3"
8+
version = "5.0.0"
99

1010
description = """
1111
Native bindings to the ICU4C library from Unicode.
@@ -17,22 +17,22 @@ keywords = ["icu", "unicode", "i18n", "l10n"]
1717
anyhow = "1.0.25"
1818
log = "0.4.6"
1919
paste = "1.0"
20-
rust_icu_common = { path = "../rust_icu_common", version = "4.2.3", default-features = false }
21-
rust_icu_sys = { path = "../rust_icu_sys", version = "4.2.3", default-features = false }
22-
rust_icu_ubrk = { path = "../rust_icu_ubrk", version = "4.2.3", default-features = false }
23-
rust_icu_ucal = { path = "../rust_icu_ucal", version = "4.2.3", default-features = false }
24-
rust_icu_ucol = { path = "../rust_icu_ucol", version = "4.2.3", default-features = false }
25-
rust_icu_ucsdet = { path = "../rust_icu_ucsdet", version = "4.2.3", default-features = false }
26-
rust_icu_udat = { path = "../rust_icu_udat", version = "4.2.3", default-features = false }
27-
rust_icu_udata = { path = "../rust_icu_udata", version = "4.2.3", default-features = false }
28-
rust_icu_uenum = { path = "../rust_icu_uenum", version = "4.2.3", default-features = false }
29-
rust_icu_ulistformatter = { path = "../rust_icu_ulistformatter", version = "4.2.3", default-features = false }
30-
rust_icu_uloc = { path = "../rust_icu_uloc", version = "4.2.3", default-features = false }
31-
rust_icu_umsg = { path = "../rust_icu_umsg", version = "4.2.3", default-features = false }
32-
rust_icu_unorm2 = { path = "../rust_icu_unorm2", version = "4.2.3", default-features = false }
33-
rust_icu_ustring = { path = "../rust_icu_ustring", version = "4.2.3", default-features = false }
34-
rust_icu_utext = { path = "../rust_icu_utext", version = "4.2.3", default-features = false }
35-
rust_icu_utrans = { path = "../rust_icu_utrans", version = "4.2.3", default-features = false }
20+
rust_icu_common = { path = "../rust_icu_common", version = "5.0.0", default-features = false }
21+
rust_icu_sys = { path = "../rust_icu_sys", version = "5.0.0", default-features = false }
22+
rust_icu_ubrk = { path = "../rust_icu_ubrk", version = "5.0.0", default-features = false }
23+
rust_icu_ucal = { path = "../rust_icu_ucal", version = "5.0.0", default-features = false }
24+
rust_icu_ucol = { path = "../rust_icu_ucol", version = "5.0.0", default-features = false }
25+
rust_icu_ucsdet = { path = "../rust_icu_ucsdet", version = "5.0.0", default-features = false }
26+
rust_icu_udat = { path = "../rust_icu_udat", version = "5.0.0", default-features = false }
27+
rust_icu_udata = { path = "../rust_icu_udata", version = "5.0.0", default-features = false }
28+
rust_icu_uenum = { path = "../rust_icu_uenum", version = "5.0.0", default-features = false }
29+
rust_icu_ulistformatter = { path = "../rust_icu_ulistformatter", version = "5.0.0", default-features = false }
30+
rust_icu_uloc = { path = "../rust_icu_uloc", version = "5.0.0", default-features = false }
31+
rust_icu_umsg = { path = "../rust_icu_umsg", version = "5.0.0", default-features = false }
32+
rust_icu_unorm2 = { path = "../rust_icu_unorm2", version = "5.0.0", default-features = false }
33+
rust_icu_ustring = { path = "../rust_icu_ustring", version = "5.0.0", default-features = false }
34+
rust_icu_utext = { path = "../rust_icu_utext", version = "5.0.0", default-features = false }
35+
rust_icu_utrans = { path = "../rust_icu_utrans", version = "5.0.0", default-features = false }
3636
thiserror = "1.0.9"
3737

3838
# See the feature description in ../rust_icu_sys/Cargo.toml for details.

‎rust_icu_common/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
edition = "2018"
33
name = "rust_icu_common"
4-
version = "4.2.3"
4+
version = "5.0.0"
55
authors = ["Google Inc."]
66
license = "Apache-2.0"
77
readme = "README.md"
@@ -19,7 +19,7 @@ keywords = ["icu", "unicode", "i18n", "l10n"]
1919
anyhow = "1.0.25"
2020
thiserror = "1.0.9"
2121

22-
rust_icu_sys = { path = "../rust_icu_sys", version = "4.2.3", default-features = false}
22+
rust_icu_sys = { path = "../rust_icu_sys", version = "5.0.0", default-features = false}
2323

2424
# See the feature description in ../rust_icu_sys/Cargo.toml for details.
2525
[features]

‎rust_icu_ecma402/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ license = "Apache-2.0"
66
name = "rust_icu_ecma402"
77
readme = "README.md"
88
repository = "https://github.com/google/rust_icu"
9-
version = "4.2.3"
9+
version = "5.0.0"
1010

1111
description = """
1212
ECMA 402 standard implementation in Rust.
1313
"""
1414
[dependencies]
1515
anyhow = "1.0.25"
16-
ecma402_traits = { path = "../ecma402_traits", version = "4.2.3" }
16+
ecma402_traits = { path = "../ecma402_traits", version = "5.0.0" }
1717
log = "0.4.6"
1818
paste = "1.0"
19-
rust_icu_common = { path = "../rust_icu_common", version = "4.2.3", default-features = false }
20-
rust_icu_udat = { path = "../rust_icu_udat", version = "4.2.3", default-features = false }
21-
rust_icu_sys = { path = "../rust_icu_sys", version = "4.2.3", default-features = false }
22-
rust_icu_uloc = { path = "../rust_icu_uloc", version = "4.2.3", default-features = false }
23-
rust_icu_ustring = { path = "../rust_icu_ustring", version = "4.2.3", default-features = false }
24-
rust_icu_ulistformatter = { path = "../rust_icu_ulistformatter", version = "4.2.3", default-features = false }
25-
rust_icu_upluralrules = { path = "../rust_icu_upluralrules", version = "4.2.3", default-features = false }
26-
rust_icu_unum = { path = "../rust_icu_unum", version = "4.2.3", default-features = false }
27-
rust_icu_unumberformatter = { path = "../rust_icu_unumberformatter", version = "4.2.3", default-features = false }
19+
rust_icu_common = { path = "../rust_icu_common", version = "5.0.0", default-features = false }
20+
rust_icu_udat = { path = "../rust_icu_udat", version = "5.0.0", default-features = false }
21+
rust_icu_sys = { path = "../rust_icu_sys", version = "5.0.0", default-features = false }
22+
rust_icu_uloc = { path = "../rust_icu_uloc", version = "5.0.0", default-features = false }
23+
rust_icu_ustring = { path = "../rust_icu_ustring", version = "5.0.0", default-features = false }
24+
rust_icu_ulistformatter = { path = "../rust_icu_ulistformatter", version = "5.0.0", default-features = false }
25+
rust_icu_upluralrules = { path = "../rust_icu_upluralrules", version = "5.0.0", default-features = false }
26+
rust_icu_unum = { path = "../rust_icu_unum", version = "5.0.0", default-features = false }
27+
rust_icu_unumberformatter = { path = "../rust_icu_unumberformatter", version = "5.0.0", default-features = false }
2828

2929
[dev-dependencies]
3030
anyhow = "1.0.25"

‎rust_icu_intl/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ license = "Apache-2.0"
55
name = "rust_icu_intl"
66
readme = "README.md"
77
repository = "https://github.com/google/rust_icu"
8-
version = "4.2.3"
8+
version = "5.0.0"
99

1010
description = """
1111
Native bindings to the ICU4C library from Unicode.
@@ -17,11 +17,11 @@ umsg.h
1717
anyhow = "1.0.25"
1818
log = "0.4.6"
1919
paste = "1.0"
20-
rust_icu_common = { path = "../rust_icu_common", version = "4.2.3", default-features = false }
21-
rust_icu_sys = { path = "../rust_icu_sys", version = "4.2.3", default-features = false }
22-
rust_icu_uloc = { path = "../rust_icu_uloc", version = "4.2.3", default-features = false }
23-
rust_icu_umsg = { path = "../rust_icu_umsg", version = "4.2.3", default-features = false }
24-
rust_icu_ustring = { path = "../rust_icu_ustring", version = "4.2.3", default-features = false }
20+
rust_icu_common = { path = "../rust_icu_common", version = "5.0.0", default-features = false }
21+
rust_icu_sys = { path = "../rust_icu_sys", version = "5.0.0", default-features = false }
22+
rust_icu_uloc = { path = "../rust_icu_uloc", version = "5.0.0", default-features = false }
23+
rust_icu_umsg = { path = "../rust_icu_umsg", version = "5.0.0", default-features = false }
24+
rust_icu_ustring = { path = "../rust_icu_ustring", version = "5.0.0", default-features = false }
2525
thiserror = "1.0.9"
2626

2727
# See the feature description in ../rust_icu_sys/Cargo.toml for details.

‎rust_icu_sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rust_icu_sys"
3-
version = "4.2.3"
3+
version = "5.0.0"
44
authors = ["Google Inc."]
55
license = "Apache-2.0"
66
readme = "README.md"

0 commit comments

Comments
 (0)