Update versions of Unicode data, CLDR, tzdata, asm and Rhino

This commit is contained in:
Alexey Andreev 2019-07-27 22:10:56 +03:00
parent d9361e339a
commit 2d3d92f9a8
9 changed files with 1310 additions and 65 deletions

View File

@ -11,7 +11,7 @@
<option name="MAIN_CLASS_NAME" value="" /> <option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" /> <option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="package" /> <option name="TEST_OBJECT" value="package" />
<option name="VM_PARAMETERS" value="-ea -Dteavm.junit.target=target/js-tests -Dteavm.junit.js.runner=htmlunit -Dteavm.junit.threads=2 -Dteavm.junit.minified=true -Dteavm.junit.optimized=true" /> <option name="VM_PARAMETERS" value="-ea -Dteavm.junit.target=target/js-tests -Dteavm.junit.js.runner=htmlunit -Dteavm.junit.threads=2 -Dteavm.junit.minified=true -Dteavm.junit.optimized=true -Dteavm.junit.js.decodeStack=false" />
<option name="PARAMETERS" value="" /> <option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<dir value="$USER_HOME$/idea-debug/teavm/tests/src/test/java" /> <dir value="$USER_HOME$/idea-debug/teavm/tests/src/test/java" />

View File

@ -30,7 +30,7 @@ import org.teavm.platform.metadata.MetadataGeneratorContext;
import org.teavm.platform.metadata.ResourceMap; import org.teavm.platform.metadata.ResourceMap;
public class TimeZoneGenerator implements MetadataGenerator { public class TimeZoneGenerator implements MetadataGenerator {
public static final String TIMEZONE_DB_VERSION = "2017b"; public static final String TIMEZONE_DB_VERSION = "2019b";
public static final String TIMEZONE_DB_PATH = "org/teavm/classlib/impl/tz/tzdata" + TIMEZONE_DB_VERSION + ".zip"; public static final String TIMEZONE_DB_PATH = "org/teavm/classlib/impl/tz/tzdata" + TIMEZONE_DB_VERSION + ".zip";
public static void compile(ZoneInfoCompiler compiler, ClassLoader classLoader) { public static void compile(ZoneInfoCompiler compiler, ClassLoader classLoader) {

22
classlib/update-cldr.sh Executable file
View File

@ -0,0 +1,22 @@
#!/bin/sh
mkdir -p build
cd build
git clone https://github.com/unicode-cldr/cldr-core
git clone https://github.com/unicode-cldr/cldr-dates-modern.git
git clone https://github.com/unicode-cldr/cldr-numbers-modern.git
git clone https://github.com/unicode-cldr/cldr-localenames-modern.git
git clone https://github.com/unicode-cldr/cldr-misc-modern.git
mkdir -p result
mkdir -p result/supplemental
cp -f cldr-core/supplemental/weekData.json result/supplemental
cp -f cldr-core/supplemental/likelySubtags.json result/supplemental
cp -rf cldr-dates-modern/main/* result/
cp -rf cldr-numbers-modern/main/* result/
cp -rf cldr-localenames-modern/main/* result/
cp -rf cldr-misc-modern/main/* result/
cd result
zip -r ../cldr-json.zip *
cd ..
cp -f cldr-json.zip ../src/main/resources/org/teavm/classlib/impl/unicode/
cd ..
rm -rf build

View File

@ -70,9 +70,9 @@
<slf4j.version>1.7.7</slf4j.version> <slf4j.version>1.7.7</slf4j.version>
<jackson.version>2.6.2</jackson.version> <jackson.version>2.6.2</jackson.version>
<idea.version>2017.3.5</idea.version> <idea.version>2017.3.5</idea.version>
<asm.version>7.0</asm.version> <asm.version>7.1</asm.version>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<rhino.version>1.7.7</rhino.version> <rhino.version>1.7.11</rhino.version>
<teavm.test.incremental>false</teavm.test.incremental> <teavm.test.incremental>false</teavm.test.incremental>
<teavm.test.threads>1</teavm.test.threads> <teavm.test.threads>1</teavm.test.threads>

View File

@ -56,11 +56,11 @@ public class CurrencyTest {
Currency currency = Currency.getInstance("USD"); Currency currency = Currency.getInstance("USD");
assertEquals("US Dollar", currency.getDisplayName(english)); assertEquals("US Dollar", currency.getDisplayName(english));
assertEquals("Доллар США", currency.getDisplayName(russian)); assertEquals("доллар сша", currency.getDisplayName(russian).toLowerCase());
currency = Currency.getInstance("RUB"); currency = Currency.getInstance("RUB");
assertEquals("Russian Ruble", currency.getDisplayName(english)); assertEquals("Russian Ruble", currency.getDisplayName(english));
assertEquals("Российский рубль", currency.getDisplayName(russian)); assertEquals("российский рубль", currency.getDisplayName(russian).toLowerCase());
assertEquals("CHF", Currency.getInstance("CHF").getDisplayName(new Locale("xx", "YY"))); assertEquals("CHF", Currency.getInstance("CHF").getDisplayName(new Locale("xx", "YY")));
} }