mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-14 17:24:01 +00:00
ICU-20482 Fix build breaks + regenerate ICU4J data files.
- Regenerate the ICU4J data files (icudata.jar and icutzdata.jar). - Remove unsupported Java Diamond operators in order to unbreak the Java build.
This commit is contained in:
parent
c7712fc83f
commit
5af4b112ac
3 changed files with 5 additions and 5 deletions
|
@ -1909,7 +1909,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
|
|||
String prefRegion = ULocale.getRegionForSupplementalData(locale, true);
|
||||
|
||||
// Read preferred calendar values from supplementalData calendarPreferences
|
||||
ArrayList<String> values = new ArrayList<>();
|
||||
ArrayList<String> values = new ArrayList<String>();
|
||||
|
||||
UResourceBundle rb = UResourceBundle.getBundleInstance(
|
||||
ICUData.ICU_BASE_NAME,
|
||||
|
@ -3497,7 +3497,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
|
|||
|
||||
// date format pattern cache
|
||||
private static final ICUCache<String, PatternData> PATTERN_CACHE =
|
||||
new SimpleCache<>();
|
||||
new SimpleCache<String, PatternData>();
|
||||
// final fallback patterns
|
||||
private static final String[] DEFAULT_PATTERNS = {
|
||||
"HH:mm:ss z",
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e2bc05ad3f8975bc49cafe3c842575ddf1d8b8b5bcc228adacd33ea59ccaba7e
|
||||
size 12508534
|
||||
oid sha256:4a4454ca40c65756c0bb6bb54195e36035e3a8ab532d56a909b5553df3ad601c
|
||||
size 12508686
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fb0ad200a056f2838c70a4a8b3b02ebf95679f80affa782cd1ca0b7370ca2c01
|
||||
oid sha256:cd1c1d204a488fe5ffc0e1dbf3d5732123d4f6b15eddf23a92082df2377d05de
|
||||
size 92857
|
||||
|
|
Loading…
Add table
Reference in a new issue