diff --git a/deps/icu-small/source/common/unicode/uvernum.h b/deps/icu-small/source/common/unicode/uvernum.h index 9fc98e738070de..1cdf8912f94b6e 100644 --- a/deps/icu-small/source/common/unicode/uvernum.h +++ b/deps/icu-small/source/common/unicode/uvernum.h @@ -59,7 +59,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_MINOR_NUM 1 +#define U_ICU_VERSION_MINOR_NUM 2 /** The current ICU patchlevel version as an integer. * This value will change in the subsequent releases of ICU @@ -132,7 +132,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "74.1" +#define U_ICU_VERSION "74.2" /** * The current ICU library major version number as a string, for library name suffixes. @@ -151,7 +151,7 @@ /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "74.1" +#define U_ICU_DATA_VERSION "74.2" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/deps/icu-small/source/data/in/icudt74l.dat.bz2 b/deps/icu-small/source/data/in/icudt74l.dat.bz2 index e299a5c8abfc02..67a0cf45606af3 100644 Binary files a/deps/icu-small/source/data/in/icudt74l.dat.bz2 and b/deps/icu-small/source/data/in/icudt74l.dat.bz2 differ diff --git a/deps/icu-small/source/i18n/dtptngen.cpp b/deps/icu-small/source/i18n/dtptngen.cpp index 2947672013e79d..aa23b7cd4a6148 100644 --- a/deps/icu-small/source/i18n/dtptngen.cpp +++ b/deps/icu-small/source/i18n/dtptngen.cpp @@ -1023,7 +1023,7 @@ struct DateTimePatternGenerator::AvailableFormatsSink : public ResourceSink { AvailableFormatsSink(DateTimePatternGenerator& _dtpg) : dtpg(_dtpg) {} virtual ~AvailableFormatsSink(); - virtual void put(const char *key, ResourceValue &value, UBool isRoot, + virtual void put(const char *key, ResourceValue &value, UBool /*isRoot*/, UErrorCode &errorCode) override { const UnicodeString formatKey(key, -1, US_INV); if (!dtpg.isAvailableFormatSet(formatKey) ) { @@ -1032,7 +1032,7 @@ struct DateTimePatternGenerator::AvailableFormatsSink : public ResourceSink { // derived from std patterns, but not a previous availableFormats entry: const UnicodeString& formatValue = value.getUnicodeString(errorCode); conflictingPattern.remove(); - dtpg.addPatternWithSkeleton(formatValue, &formatKey, !isRoot, conflictingPattern, errorCode); + dtpg.addPatternWithSkeleton(formatValue, &formatKey, true, conflictingPattern, errorCode); } } }; diff --git a/test/fixtures/tz-version.txt b/test/fixtures/tz-version.txt index cd9c3f6d6e52d0..04fe6744432fa4 100644 --- a/test/fixtures/tz-version.txt +++ b/test/fixtures/tz-version.txt @@ -1 +1 @@ -2023d +2024a diff --git a/test/parallel/test-icu-env.js b/test/parallel/test-icu-env.js index d453281bd726f8..45b9fea8dbd8c8 100644 --- a/test/parallel/test-icu-env.js +++ b/test/parallel/test-icu-env.js @@ -123,19 +123,19 @@ if (isMockable) { locales.map((LANG) => runEnvOutside({ LANG, TZ: 'Europe/Zurich' }, 'new Date(333333333333).toLocaleString()')), [ '7/25/1980, 1:35:33 AM', - '1980/7/25 1:35:33', + '1980/7/25 01:35:33', '25/7/1980, 1:35:33 am', '25/7/1980, 1:35:33', - '25/07/1980 1:35:33', + '25/07/1980 01:35:33', '٢٥‏/٧‏/١٩٨٠، ١:٣٥:٣٣ ص', '২৫/৭/১৯৮০, ১:৩৫:৩৩ AM', - '25.07.1980, 1:35:33', - '25/07/1980, 1:35:33', + '25.07.1980, 01:35:33', + '25/07/1980, 01:35:33', '25/7/1980، 1:35:33 AM', '25/7/1980, 01.35.33', - '25.7.1980, 1:35:33', + '25.7.1980, 01:35:33', '1980/7/25 1:35:33', - '25/7/1980 1:35:33', + '25/7/1980 01:35:33', '२५/७/१९८०, १:३५:३३ AM', '25/7/1980 1:35:33 AM', ] diff --git a/tools/dep_updaters/update-icu.sh b/tools/dep_updaters/update-icu.sh index 0f53d5cce85f5e..e79a6218307710 100755 --- a/tools/dep_updaters/update-icu.sh +++ b/tools/dep_updaters/update-icu.sh @@ -40,7 +40,7 @@ NEW_VERSION_TGZ="icu4c-${LOW_DASHED_NEW_VERSION}-src.tgz" NEW_VERSION_TGZ_URL="https://github.com/unicode-org/icu/releases/download/release-${DASHED_NEW_VERSION}/$NEW_VERSION_TGZ" -NEW_VERSION_MD5="https://github.com/unicode-org/icu/releases/download/release-${DASHED_NEW_VERSION}/icu4c-${LOW_DASHED_NEW_VERSION}-src.md5" +NEW_VERSION_MD5="https://github.com/unicode-org/icu/releases/download/release-${DASHED_NEW_VERSION}/icu4c-${LOW_DASHED_NEW_VERSION}-sources.md5" CHECKSUM=$(curl -sL "$NEW_VERSION_MD5" | grep "$NEW_VERSION_TGZ" | grep -v "\.asc$" | awk '{print $1}') diff --git a/tools/icu/current_ver.dep b/tools/icu/current_ver.dep index e7a01203021fee..9b937c67c137d8 100644 --- a/tools/icu/current_ver.dep +++ b/tools/icu/current_ver.dep @@ -1,6 +1,6 @@ [ { - "url": "https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz", - "md5": "71e60b22697c4f35820a1897417dbab4" + "url": "https://github.com/unicode-org/icu/releases/download/release-74-2/icu4c-74_2-src.tgz", + "md5": "94c0b370f43123ea92b146ebea9c709d" } ]