diff options
author | Victor Chang <vichang@google.com> | 2022-11-14 15:02:04 +0000 |
---|---|---|
committer | Victor Chang <vichang@google.com> | 2022-11-14 15:02:04 +0000 |
commit | 171e5430c389ca5e4a13ebd4d90b506cc163b074 (patch) | |
tree | edf4388b3ced07caae4ed091ae7cd3886534e4d2 /icu4j/main/shared | |
parent | 64605e412a6b8b972e259cb33dd629aaafa952a8 (diff) | |
download | icu-171e5430c389ca5e4a13ebd4d90b506cc163b074.tar.gz |
Copy ICU release-72-1 into aosp/icu72
Copy the files with the following commands:
find icu4j/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\|adjust_icudt_path.mk\|liblayout-jarjar-rules.txt\|.gitignore\|AndroidTest.xml\)" -delete
find icu4c/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\|.gitignore\|AndroidTest.xml\)" -delete
cp -r ${UPSTREAM_ICU_GIT}/icu4j .
cp -r ${UPSTREAM_ICU_GIT}/icu4c .
git checkout HEAD -- icu4c/.gitignore icu4j/.gitignore
rm -r tools/cldr
cp -r ${UPSTREAM_ICU_GIT}/tools/cldr tools/cldr
Change-Id: Ib4cc472068aca595503f67147f2aa968cb2b14c1
Diffstat (limited to 'icu4j/main/shared')
-rw-r--r-- | icu4j/main/shared/build/common-targets.xml | 8 | ||||
-rw-r--r-- | icu4j/main/shared/build/common.properties | 10 | ||||
-rw-r--r-- | icu4j/main/shared/data/icudata.jar | bin | 12114063 -> 14175154 bytes | |||
-rw-r--r-- | icu4j/main/shared/data/icutzdata.jar | bin | 93474 -> 93462 bytes | |||
-rw-r--r-- | icu4j/main/shared/data/testdata.jar | bin | 826058 -> 831605 bytes |
5 files changed, 5 insertions, 13 deletions
diff --git a/icu4j/main/shared/build/common-targets.xml b/icu4j/main/shared/build/common-targets.xml index 5d686a593..3134360d9 100644 --- a/icu4j/main/shared/build/common-targets.xml +++ b/icu4j/main/shared/build/common-targets.xml @@ -25,17 +25,10 @@ <target name="@compile"> <echo message="build-local: ${global.build-local.properties}"/> - <!-- set java 7 bootclasspath to empty if not set --> - <property name="java7.bootclasspath" value=""/> - - <condition property="javac.bootclasspath" value="${java7.bootclasspath}" else=""> - <equals arg1="${javac.target}" arg2="1.7"/> - </condition> <echo message="--- java compiler arguments ------------------------"/> <echo message="source dir: ${basedir}/${src.dir}"/> <echo message="output dir: ${basedir}/${bin.dir}"/> - <echo message="bootclasspath: ${javac.bootclasspath}"/> <echo message="classpath: ${toString:javac.classpathref}"/> <echo message="source: ${javac.source}"/> <echo message="target: ${javac.target}"/> @@ -48,7 +41,6 @@ <javac srcdir="${src.dir}" destdir="${bin.dir}" - bootclasspath="${javac.bootclasspath}" classpathref="javac.classpathref" source="${javac.source}" target="${javac.target}" diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties index a565191c8..cf90aee1a 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 = 71 -icu4j.impl.version = 71.1 -icu4j.data.version = 71 +icu4j.spec.version = 72 +icu4j.impl.version = 72.1 +icu4j.data.version = 72 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 @@ -20,8 +20,8 @@ bin.dir = ${out.dir}/bin jar.dir = ${out.dir}/lib # Default java compiler options -javac.source = 1.7 -javac.target = 1.7 +javac.source = 1.8 +javac.target = 1.8 javac.debug = on javac.compilerarg = -Xlint:none java.src.encoding = UTF-8 diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar Binary files differindex 39a7bfc80..e6e6cc932 100644 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar Binary files differindex 424fc6a86..7c2fb9dac 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar Binary files differindex d3446ba90..05380642e 100644 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar |