Skip to content

Commit

Permalink
ICU resources: update resources to version 60b.
Browse files Browse the repository at this point in the history
The resources were copied from the Android Pie release:
https://android.googlesource.com/platform/external/icu/+/refs/heads/pie-release/icu4j/main/shared/data/

Also a few files were updated to their Pie version to fix runtime/test errors caused by this update:
+ Normalizer2Impl.java: tied to a new version of the embedded data (see isDataVersionAcceptable method).
+ Norm2AllModes.java: updated due to changes in Normalizer2Impl API.
+ DateTimePatternGenerator.java: to support the new datetime formats:b and B.

	Change on 2019/04/09 by antoniocortes <antoniocortes@google.com>

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=242764805
  • Loading branch information
antonio-cortes-perez committed May 7, 2019
1 parent bf5635f commit 7b50380
Show file tree
Hide file tree
Showing 8 changed files with 808 additions and 644 deletions.
Expand Up @@ -24,7 +24,7 @@

/*-[
// J2ObjC: make sure that the embedded resources are linked by referencing
// the class defined in jre_emul/android/platform/external/icu/data/ICUData.m.
// the class ICUData.m which is generated at build time (see jre_emul/icu_data.mk).
#pragma clang diagnostic push
#pragma GCC diagnostic ignored "-Wreceiver-forward-class"
@class ICUData;
Expand Down
Expand Up @@ -189,9 +189,9 @@ public int getQuickCheck(int c) {
return impl.isDecompYes(impl.getNorm16(c)) ? 1 : 0;
}
@Override
public boolean hasBoundaryBefore(int c) { return impl.hasDecompBoundary(c, true); }
public boolean hasBoundaryBefore(int c) { return impl.hasDecompBoundaryBefore(c); }
@Override
public boolean hasBoundaryAfter(int c) { return impl.hasDecompBoundary(c, false); }
public boolean hasBoundaryAfter(int c) { return impl.hasDecompBoundaryAfter(c); }
@Override
public boolean isInert(int c) { return impl.isDecompInert(c); }
}
Expand Down Expand Up @@ -242,11 +242,11 @@ public int getQuickCheck(int c) {
public boolean hasBoundaryBefore(int c) { return impl.hasCompBoundaryBefore(c); }
@Override
public boolean hasBoundaryAfter(int c) {
return impl.hasCompBoundaryAfter(c, onlyContiguous, false);
return impl.hasCompBoundaryAfter(c, onlyContiguous);
}
@Override
public boolean isInert(int c) {
return impl.hasCompBoundaryAfter(c, onlyContiguous, true);
return impl.isCompInert(c, onlyContiguous);
}

private final boolean onlyContiguous;
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Expand Up @@ -156,7 +156,7 @@ public final class VersionInfo implements Comparable<VersionInfo>
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
public static final String ICU_DATA_VERSION_PATH = "58b";
public static final String ICU_DATA_VERSION_PATH = "60b";

/**
* Data version in ICU4J.
Expand Down
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion jre_emul/icu_data.mk
Expand Up @@ -13,7 +13,7 @@
# Rules for generating the embedded ICU resources.

ICU_EXTRACTED_RES_DIR = $(ICU_RES_DIR)/extracted
ICU_RES_PACKAGE = com/ibm/icu/impl/data/icudt58b
ICU_RES_PACKAGE = com/ibm/icu/impl/data/icudt60b

ICU_DATA_ZIP = android/platform/external/icu/icu4j/main/shared/data/icudata.jar

Expand Down

0 comments on commit 7b50380

Please sign in to comment.