From 48ef451b8741f2e932b1338814eae882d6f0f2fa Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Fri, 4 Jun 2021 18:45:05 +0000 Subject: [PATCH] ICU-21581 BRSRC 70.0.1 Version update and regenerate configure for v70.0.1 See #1738 --- icu4c/source/common/common.vcxproj | 4 ++-- icu4c/source/common/common_uwp.vcxproj | 4 ++-- icu4c/source/common/unicode/uvernum.h | 14 +++++++------- icu4c/source/configure | 18 +++++++++--------- icu4c/source/data/makedata.mak | 4 ++-- icu4c/source/data/misc/icuver.txt | 4 ++-- icu4c/source/i18n/i18n.vcxproj | 4 ++-- icu4c/source/i18n/i18n_uwp.vcxproj | 16 ++++++++-------- icu4c/source/io/io.vcxproj | 4 ++-- icu4c/source/layoutex/layoutex.vcxproj | 8 ++++---- icu4c/source/stubdata/stubdata.vcxproj | 2 +- icu4c/source/tools/ctestfw/ctestfw.vcxproj | 4 ++-- icu4c/source/tools/toolutil/toolutil.vcxproj | 16 ++++++++-------- icu4j/build.properties | 10 +++++----- .../core/src/com/ibm/icu/util/VersionInfo.java | 4 ++-- icu4j/main/shared/build/common.properties | 6 +++--- icu4j/main/shared/data/icudata.jar | 4 ++-- icu4j/main/shared/data/icutzdata.jar | 4 ++-- icu4j/main/shared/data/testdata.jar | 4 ++-- .../icu/dev/test/util/DebugUtilitiesData.java | 2 +- tools/cldr/cldr-to-icu/build-icu-data.xml | 4 ++-- 21 files changed, 70 insertions(+), 70 deletions(-) diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj index bf90db2e43c..d6f0ff8b541 100644 --- a/icu4c/source/common/common.vcxproj +++ b/icu4c/source/common/common.vcxproj @@ -58,7 +58,7 @@ MultiThreadedDebugDLL - ..\..\$(IcuBinOutputDir)\icuuc69d.dll + ..\..\$(IcuBinOutputDir)\icuuc70d.dll .\..\..\$(IcuLibOutputDir)\icuucd.pdb ..\..\$(IcuLibOutputDir)\icuucd.lib @@ -70,7 +70,7 @@ true - ..\..\$(IcuBinOutputDir)\icuuc69.dll + ..\..\$(IcuBinOutputDir)\icuuc70.dll .\..\..\$(IcuLibOutputDir)\icuuc.pdb ..\..\$(IcuLibOutputDir)\icuuc.lib diff --git a/icu4c/source/common/common_uwp.vcxproj b/icu4c/source/common/common_uwp.vcxproj index f22d46e14f5..d1b425b0f2f 100644 --- a/icu4c/source/common/common_uwp.vcxproj +++ b/icu4c/source/common/common_uwp.vcxproj @@ -125,7 +125,7 @@ true vccorlib.lib;msvcrt.lib;vcruntime.lib;%(AdditionalDependencies) - ..\..\$(IcuBinOutputDir)\icuuc69.dll + ..\..\$(IcuBinOutputDir)\icuuc70.dll .\..\..\$(IcuLibOutputDir)\icuuc.pdb ..\..\$(IcuLibOutputDir)\icuuc.lib @@ -148,7 +148,7 @@ true vccorlibd.lib;msvcrtd.lib;vcruntimed.lib;%(AdditionalDependencies) - ..\..\$(IcuBinOutputDir)\icuuc69d.dll + ..\..\$(IcuBinOutputDir)\icuuc70d.dll .\..\..\$(IcuLibOutputDir)\icuucd.pdb ..\..\$(IcuLibOutputDir)\icuucd.lib diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index b09d4943c1c..d5bdb0f949e 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -60,19 +60,19 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION_MAJOR_NUM 69 +#define U_ICU_VERSION_MAJOR_NUM 70 /** The current ICU minor version as an integer. * 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 0 /** The current ICU patchlevel version as an integer. * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION_PATCHLEVEL_NUM 0 +#define U_ICU_VERSION_PATCHLEVEL_NUM 1 /** The current ICU build level version as an integer. * This value is for use by ICU clients. It defaults to 0. @@ -86,7 +86,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_SUFFIX _69 +#define U_ICU_VERSION_SUFFIX _70 /** * \def U_DEF2_ICU_ENTRY_POINT_RENAME @@ -139,7 +139,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "69.1" +#define U_ICU_VERSION "70.0.1" /** * The current ICU library major version number as a string, for library name suffixes. @@ -152,13 +152,13 @@ * * @stable ICU 2.6 */ -#define U_ICU_VERSION_SHORT "69" +#define U_ICU_VERSION_SHORT "70" #ifndef U_HIDE_INTERNAL_API /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "69.1" +#define U_ICU_DATA_VERSION "70.0.1" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/icu4c/source/configure b/icu4c/source/configure index a2ff7e4885e..627fffda44a 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ICU 69.1. +# Generated by GNU Autoconf 2.69 for ICU 70.0.1. # # Report bugs to . # @@ -582,8 +582,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ICU' PACKAGE_TARNAME='International Components for Unicode' -PACKAGE_VERSION='69.1' -PACKAGE_STRING='ICU 69.1' +PACKAGE_VERSION='70.0.1' +PACKAGE_STRING='ICU 70.0.1' PACKAGE_BUGREPORT='http://icu-project.org/bugs' PACKAGE_URL='http://icu-project.org' @@ -1364,7 +1364,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ICU 69.1 to adapt to many kinds of systems. +\`configure' configures ICU 70.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1430,7 +1430,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ICU 69.1:";; + short | recursive ) echo "Configuration of ICU 70.0.1:";; esac cat <<\_ACEOF @@ -1568,7 +1568,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ICU configure 69.1 +ICU configure 70.0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2314,7 +2314,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ICU $as_me 69.1, which was +It was created by ICU $as_me 70.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8544,7 +8544,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ICU $as_me 69.1, which was +This file was extended by ICU $as_me 70.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8598,7 +8598,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ICU config.status 69.1 +ICU config.status 70.0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak index 286c18a4d7c..496576651a9 100644 --- a/icu4c/source/data/makedata.mak +++ b/icu4c/source/data/makedata.mak @@ -12,11 +12,11 @@ ############################################################################## # Keep the following in sync with the version - see common/unicode/uvernum.h -U_ICUDATA_NAME=icudt69 +U_ICUDATA_NAME=icudt70 ############################################################################## !IF "$(UWP)" == "UWP" # Optionally change the name of the data file for the UWP version. -U_ICUDATA_NAME=icudt69 +U_ICUDATA_NAME=icudt70 !ENDIF U_ICUDATA_ENDIAN_SUFFIX=l UNICODE_VERSION=13.0 diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt index feb59d2a9bf..24e487d3fa8 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -9,6 +9,6 @@ // *************************************************************************** icuver:table(nofallback){ CLDRVersion{"39"} - DataVersion{"69.1.0.0"} - ICUVersion{"69.1.0.0"} + DataVersion{"70.0.1.0"} + ICUVersion{"70.0.1.0"} } diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj index ce8933a0d3a..3471cf3e55d 100644 --- a/icu4c/source/i18n/i18n.vcxproj +++ b/icu4c/source/i18n/i18n.vcxproj @@ -60,7 +60,7 @@ icuucd.lib;%(AdditionalDependencies) - ..\..\$(IcuBinOutputDir)\icuin69d.dll + ..\..\$(IcuBinOutputDir)\icuin70d.dll .\..\..\$(IcuLibOutputDir)\icuind.pdb ..\..\$(IcuLibOutputDir)\icuind.lib @@ -73,7 +73,7 @@ icuuc.lib;%(AdditionalDependencies) - ..\..\$(IcuBinOutputDir)\icuin69.dll + ..\..\$(IcuBinOutputDir)\icuin70.dll .\..\..\$(IcuLibOutputDir)\icuin.pdb ..\..\$(IcuLibOutputDir)\icuin.lib diff --git a/icu4c/source/i18n/i18n_uwp.vcxproj b/icu4c/source/i18n/i18n_uwp.vcxproj index 489b460b3ce..c7358d72e59 100644 --- a/icu4c/source/i18n/i18n_uwp.vcxproj +++ b/icu4c/source/i18n/i18n_uwp.vcxproj @@ -186,7 +186,7 @@ .\x86\ReleaseUWP/ - ..\..\bin32uwp\icuin69.dll + ..\..\bin32uwp\icuin70.dll .\..\..\lib32uwp\icuin.pdb ..\..\lib32uwp\icuin.lib ..\..\lib32uwp\icuuc.lib;%(AdditionalDependencies) @@ -203,7 +203,7 @@ .\x86\DebugUWP/ - ..\..\bin32uwp\icuin69d.dll + ..\..\bin32uwp\icuin70d.dll .\..\..\lib32uwp\icuind.pdb ..\..\lib32uwp\icuind.lib ..\..\lib32uwp\icuucd.lib;%(AdditionalDependencies) @@ -220,7 +220,7 @@ .\x64\ReleaseUWP/ - ..\..\bin64uwp\icuin69.dll + ..\..\bin64uwp\icuin70.dll .\..\..\lib64uwp\icuin.pdb ..\..\lib64uwp\icuin.lib ..\..\lib64uwp\icuuc.lib;%(AdditionalDependencies) @@ -237,7 +237,7 @@ .\x64\DebugUWP/ - ..\..\bin64uwp\icuin69d.dll + ..\..\bin64uwp\icuin70d.dll .\..\..\lib64uwp\icuind.pdb ..\..\lib64uwp\icuind.lib ..\..\lib64uwp\icuucd.lib;%(AdditionalDependencies) @@ -254,7 +254,7 @@ .\ARM\ReleaseUWP/ - ..\..\binARMuwp\icuin69.dll + ..\..\binARMuwp\icuin70.dll .\..\..\libARMuwp\icuin.pdb ..\..\libARMuwp\icuin.lib ..\..\libARMuwp\icuuc.lib;%(AdditionalDependencies) @@ -271,7 +271,7 @@ .\ARM\DebugUWP/ - ..\..\binARMuwp\icuin69d.dll + ..\..\binARMuwp\icuin70d.dll .\..\..\libARMuwp\icuind.pdb ..\..\libARMuwp\icuind.lib ..\..\libARMuwp\icuucd.lib;%(AdditionalDependencies) @@ -288,7 +288,7 @@ .\ARM64\ReleaseUWP/ - ..\..\binARM64uwp\icuin69.dll + ..\..\binARM64uwp\icuin70.dll .\..\..\libARM64uwp\icuin.pdb ..\..\libARM64uwp\icuin.lib ..\..\libARM64uwp\icuuc.lib;%(AdditionalDependencies) @@ -305,7 +305,7 @@ .\ARM64\DebugUWP/ - ..\..\binARM64uwp\icuin69d.dll + ..\..\binARM64uwp\icuin70d.dll .\..\..\libARM64uwp\icuind.pdb ..\..\libARM64uwp\icuind.lib ..\..\libARM64uwp\icuucd.lib;%(AdditionalDependencies) diff --git a/icu4c/source/io/io.vcxproj b/icu4c/source/io/io.vcxproj index 5addb36a205..56957edc8b9 100644 --- a/icu4c/source/io/io.vcxproj +++ b/icu4c/source/io/io.vcxproj @@ -60,7 +60,7 @@ true - ..\..\$(IcuBinOutputDir)\icuio69d.dll + ..\..\$(IcuBinOutputDir)\icuio70d.dll ..\..\$(IcuLibOutputDir)\icuiod.pdb ..\..\$(IcuLibOutputDir)\icuiod.lib icuucd.lib;icuind.lib;%(AdditionalDependencies) @@ -73,7 +73,7 @@ true - ..\..\$(IcuBinOutputDir)\icuio69.dll + ..\..\$(IcuBinOutputDir)\icuio70.dll ..\..\$(IcuLibOutputDir)\icuio.pdb ..\..\$(IcuLibOutputDir)\icuio.lib icuuc.lib;icuin.lib;%(AdditionalDependencies) diff --git a/icu4c/source/layoutex/layoutex.vcxproj b/icu4c/source/layoutex/layoutex.vcxproj index 3c7941fc0b7..810bbba913c 100644 --- a/icu4c/source/layoutex/layoutex.vcxproj +++ b/icu4c/source/layoutex/layoutex.vcxproj @@ -54,7 +54,7 @@ Default - ..\..\bin\iculx69.dll + ..\..\bin\iculx70.dll icuuc.lib;%(AdditionalDependencies) .\..\..\lib;%(AdditionalLibraryDirectories) .\..\..\lib\iculx.pdb @@ -79,7 +79,7 @@ Default - ..\..\bin\iculx69d.dll + ..\..\bin\iculx70d.dll icuucd.lib;%(AdditionalDependencies) .\..\..\lib;%(AdditionalLibraryDirectories) true @@ -104,7 +104,7 @@ Default - ..\..\bin64\iculx69.dll + ..\..\bin64\iculx70.dll icuuc.lib;%(AdditionalDependencies) .\..\..\lib64;%(AdditionalLibraryDirectories) .\..\..\lib64\iculx.pdb @@ -127,7 +127,7 @@ Default - ..\..\bin64\iculx69d.dll + ..\..\bin64\iculx70d.dll icuucd.lib;%(AdditionalDependencies) .\..\..\lib64;%(AdditionalLibraryDirectories) true diff --git a/icu4c/source/stubdata/stubdata.vcxproj b/icu4c/source/stubdata/stubdata.vcxproj index cc734dfcbb9..64a6ef1a03a 100644 --- a/icu4c/source/stubdata/stubdata.vcxproj +++ b/icu4c/source/stubdata/stubdata.vcxproj @@ -56,7 +56,7 @@ true true - ..\..\$(IcuBinOutputDir)\icudt69.dll + ..\..\$(IcuBinOutputDir)\icudt70.dll .\..\..\$(IcuLibOutputDir)\icudt.pdb ..\..\$(IcuLibOutputDir)\icudt.lib diff --git a/icu4c/source/tools/ctestfw/ctestfw.vcxproj b/icu4c/source/tools/ctestfw/ctestfw.vcxproj index 1d6be880236..1dd8e2602c5 100644 --- a/icu4c/source/tools/ctestfw/ctestfw.vcxproj +++ b/icu4c/source/tools/ctestfw/ctestfw.vcxproj @@ -53,7 +53,7 @@ MultiThreadedDebugDLL - ..\..\..\$(IcuBinOutputDir)\icutest69d.exe + ..\..\..\$(IcuBinOutputDir)\icutest70d.exe .\..\..\..\$(IcuLibOutputDir)\icutestd.pdb .\..\..\..\$(IcuLibOutputDir)\icutestd.lib icuucd.lib;icutud.lib;%(AdditionalDependencies) @@ -66,7 +66,7 @@ true - ..\..\..\$(IcuBinOutputDir)\icutest69.exe + ..\..\..\$(IcuBinOutputDir)\icutest70.exe .\..\..\..\$(IcuLibOutputDir)\icutest.pdb .\..\..\..\$(IcuLibOutputDir)\icutest.lib icuuc.lib;icutu.lib;%(AdditionalDependencies) diff --git a/icu4c/source/tools/toolutil/toolutil.vcxproj b/icu4c/source/tools/toolutil/toolutil.vcxproj index 02e1d29b5bf..b74ac41cb0e 100644 --- a/icu4c/source/tools/toolutil/toolutil.vcxproj +++ b/icu4c/source/tools/toolutil/toolutil.vcxproj @@ -74,7 +74,7 @@ .\..\..\..\lib\icutu.tlb - ..\..\..\bin\icutu69.dll + ..\..\..\bin\icutu70.dll .\..\..\..\lib\icutu.pdb @@ -86,7 +86,7 @@ .\..\..\..\lib\icutud.tlb - ..\..\..\bin\icutu69d.dll + ..\..\..\bin\icutu70d.dll .\..\..\..\lib\icutud.pdb @@ -113,7 +113,7 @@ true - ..\..\..\bin64\icutu69.dll + ..\..\..\bin64\icutu70.dll .\..\..\..\lib64\icutu.pdb ..\..\..\lib64\icutu.lib @@ -123,7 +123,7 @@ .\..\..\..\lib64\icutud.tlb - ..\..\..\bin64\icutu69d.dll + ..\..\..\bin64\icutu70d.dll .\..\..\..\lib64\icutud.pdb ..\..\..\lib64\icutud.lib @@ -144,7 +144,7 @@ ..\..\..\libARM\icutu.tlb - ..\..\..\binARM\icutu69.dll + ..\..\..\binARM\icutu70.dll .\..\..\..\libARM\icutu.pdb ..\..\..\libARM\icutu.lib @@ -157,7 +157,7 @@ ProgramDatabase - ..\..\..\binARM\icutu69d.dll + ..\..\..\binARM\icutu70d.dll .\..\..\..\libARM\icutud.pdb ..\..\..\libARM\icutud.lib @@ -178,7 +178,7 @@ .\..\..\..\libARM64\icutu.tlb - ..\..\..\binARM64\icutu69.dll + ..\..\..\binARM64\icutu70.dll .\..\..\..\libARM64\icutu.pdb ..\..\..\libARM64\icutu.lib @@ -191,7 +191,7 @@ ProgramDatabase - ..\..\..\binARM64\icutu69d.dll + ..\..\..\binARM64\icutu70d.dll .\..\..\..\libARM64\icutud.pdb ..\..\..\libARM64\icutud.lib diff --git a/icu4j/build.properties b/icu4j/build.properties index 260b9867db6..de5d8e4f941 100644 --- a/icu4j/build.properties +++ b/icu4j/build.properties @@ -4,9 +4,9 @@ #* Copyright (C) 2009-2016, International Business Machines Corporation and * #* others. All Rights Reserved. * #******************************************************************************* -api.report.version = 69 -api.report.prev.version = 68 -release.file.ver = 69_1 -api.doc.version = 69.1 -maven.pom.ver = 69.1 +api.report.version = 70 +api.report.prev.version = 69 +release.file.ver = 70rc +api.doc.version = 70 Release Candidate +maven.pom.ver = 70.0.1-SNAPSHOT diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java index e33c51762b2..21bbe36b153 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java @@ -212,7 +212,7 @@ public final class VersionInfo implements Comparable * @deprecated This API is ICU internal only. */ @Deprecated - public static final String ICU_DATA_VERSION_PATH = "69b"; + public static final String ICU_DATA_VERSION_PATH = "70b"; /** * Data version in ICU4J. @@ -553,7 +553,7 @@ public final class VersionInfo implements Comparable UNICODE_12_1 = getInstance(12, 1, 0, 0); UNICODE_13_0 = getInstance(13, 0, 0, 0); - ICU_VERSION = getInstance(69, 1, 0, 0); + ICU_VERSION = getInstance(70, 0, 1, 0); ICU_DATA_VERSION = ICU_VERSION; UNICODE_VERSION = UNICODE_13_0; diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties index 0ddf06dc8b6..6578a6f1cc6 100644 --- a/icu4j/main/shared/build/common.properties +++ b/icu4j/main/shared/build/common.properties @@ -6,9 +6,9 @@ #******************************************************************************* # Version numbers, etc. -icu4j.spec.version = 69 -icu4j.impl.version = 69.1 -icu4j.data.version = 69 +icu4j.spec.version = 70 +icu4j.impl.version = 70.0.1 +icu4j.data.version = 70 default.exec.env = JavaSE-1.7 copyright = \u00A9 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index c7d3d129e98..59e4c08acda 100644 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6614997945a564e6888da79d06283f519a34d9e13caf8b10eba68ee9f098efda -size 13383850 +oid sha256:c6204593a97c614d968ee1c9411e3b7bc5c4b6712a300d55f2974fe9f6552d2c +size 13383699 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index c0b07c2cf00..18bde5b124c 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da82185ad36c6b747848c409fff8661892c0ed5d5ebc0cdf8be9d29f4e3f65ef -size 95096 +oid sha256:b0c62aeba1f0608064e1253a6fc6d55e539c8e536bc45ad1e557afa6a56e3341 +size 95105 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 64da45ae4b0..ed97c19d6e6 100644 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9184fdb3a90361165d9c90081a681450a6a049beaf669a24580dcf23134142c7 -size 825810 +oid sha256:acb188c16c4dca34db02d99059736ca963c084488d26972399292ebb86d657c5 +size 828801 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java index 9c75c5ba0ae..9e608627796 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java @@ -10,7 +10,7 @@ package com.ibm.icu.dev.test.util; public class DebugUtilitiesData extends Object { - public static final String ICU4C_VERSION="69.1"; + public static final String ICU4C_VERSION="70.0.1"; public static final int UDebugEnumType = 0; public static final int UCalendarDateFields = 1; public static final int UCalendarMonths = 2; diff --git a/tools/cldr/cldr-to-icu/build-icu-data.xml b/tools/cldr/cldr-to-icu/build-icu-data.xml index 22f87804f1a..115cb4b5be6 100644 --- a/tools/cldr/cldr-to-icu/build-icu-data.xml +++ b/tools/cldr/cldr-to-icu/build-icu-data.xml @@ -47,10 +47,10 @@ - + - + -- 2.40.0