Skip to content

Commit 349dc59

Browse files
committed
Merge branch 'master' into update-node-to-14.17.2
2 parents cdb69ca + 857ee1f commit 349dc59

File tree

353 files changed

+6400
-4638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

353 files changed

+6400
-4638
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ The main focus is on user-observable behavior of the engine.
55

66
## Version 21.3.0
77
* Implemented the [Error Cause](https://github.com/tc39/proposal-error-cause) proposal. It is available behind the experimental option `--js.error-cause`.
8+
* Implemented the [Import Assertions](https://tc39.es/proposal-import-assertions) proposal. It is available behind the experimental option `--js.import-assertions`.
9+
* Added support for `collation` option of `Intl.Collator`.
10+
* Added support for `dayPeriod` and `fractionalSecondDigits` options of `Intl.DateTimeFormat`.
11+
* Changed foreign hash map access using `map[key]` syntax to convert the key to a string or symbol.
812

913
## Version 21.2.0
1014
* Graal.js now prints a warning when runtime compilation is not supported. This warning can be disabled using the '--engine.WarnInterpreterOnly=false' option or the '-Dpolyglot.engine.WarnInterpreterOnly=false' system property.
@@ -14,6 +18,7 @@ The main focus is on user-observable behavior of the engine.
1418
* Updated RegExp Match Indices proposal with opt-in using the `d` flag. Available in ECMAScript 2022 (`--js.ecmascript-version=2022`). Deprecated `--js.regexp-match-indices` option.
1519
* Nashorn compatibility mode now defaults to compatiblity with ECMAScript version 5, unless another version is explicitly selected.
1620
* `Date.prototype` built-ins use ICU (not JDK) algorithms and data (like timezone data) by now (in order to reduce inconsistencies between `Date` and `Intl.DateTimeFormat`).
21+
* Updated ICU4J library to version 69.1.
1722

1823
## Version 21.1.0
1924
* Updated Node.js to version 14.16.1.

common.json

+34-9
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
"README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
33

44
"jdks": {
5-
"openjdk8": {"name": "openjdk", "version": "8u302+05-jvmci-21.2-b04", "platformspecific": true },
6-
"oraclejdk8": {"name": "oraclejdk", "version": "8u301+09-jvmci-21.2-b04", "platformspecific": true },
7-
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u301+09-jvmci-21.2-b04-fastdebug", "platformspecific": true },
5+
"openjdk8": {"name": "openjdk", "version": "8u302+06-jvmci-21.3-b01", "platformspecific": true },
6+
"oraclejdk8": {"name": "oraclejdk", "version": "8u301+09-jvmci-21.3-b01", "platformspecific": true },
7+
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u301+09-jvmci-21.3-b01-fastdebug", "platformspecific": true },
88

99
"openjdk11": {"name": "openjdk", "version": "11.0.11+9", "platformspecific": true },
1010
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
11-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.12+5-jvmci-21.2-b04", "platformspecific": true },
12-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.12+8-jvmci-21.2-b04", "platformspecific": true },
11+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.12+5-jvmci-21.3-b01", "platformspecific": true },
12+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.13+2-jvmci-21.3-b01", "platformspecific": true },
1313

1414
"oraclejdk16": {"name": "oraclejdk", "version": "16.0.1+4", "platformspecific": true },
15-
"labsjdk-ce-16": {"name": "labsjdk", "version": "ce-16.0.2+6-jvmci-21.2-b04", "platformspecific": true },
16-
"labsjdk-ce-16Debug": {"name": "labsjdk", "version": "ce-16.0.2+6-jvmci-21.2-b04-debug", "platformspecific": true },
17-
"labsjdk-ee-16": {"name": "labsjdk", "version": "ee-16.0.2+6-jvmci-21.2-b04", "platformspecific": true },
18-
"labsjdk-ee-16Debug": {"name": "labsjdk", "version": "ee-16.0.2+6-jvmci-21.2-b04-debug", "platformspecific": true }
15+
"labsjdk-ce-16": {"name": "labsjdk", "version": "ce-16.0.2+7-jvmci-21.2-b05", "platformspecific": true },
16+
"labsjdk-ce-16Debug": {"name": "labsjdk", "version": "ce-16.0.2+7-jvmci-21.2-b05-debug", "platformspecific": true },
17+
"labsjdk-ee-16": {"name": "labsjdk", "version": "ee-16.0.2+7-jvmci-21.2-b05", "platformspecific": true },
18+
"labsjdk-ee-16Debug": {"name": "labsjdk", "version": "ee-16.0.2+7-jvmci-21.2-b05-debug", "platformspecific": true }
1919
},
2020

2121
"COMMENT" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
@@ -83,6 +83,7 @@
8383
},
8484
"sulong": {
8585
"deps": {
86+
"common": {},
8687
"linux": {
8788
"packages": {
8889
"cmake": "==3.15.2"
@@ -100,5 +101,29 @@
100101
}
101102
}
102103
}
104+
},
105+
"truffleruby": {
106+
"deps": {
107+
"common": {},
108+
"linux": {
109+
"packages": {
110+
"ruby": "==2.6.3"
111+
}
112+
},
113+
"darwin": {}
114+
}
115+
},
116+
"graalnodejs": {
117+
"deps": {
118+
"common": {},
119+
"linux": {
120+
"packages": {
121+
"binutils": "==2.23.2",
122+
"gcc": "==8.3.0",
123+
"cmake": "==3.15.2"
124+
}
125+
},
126+
"darwin": {}
127+
}
103128
}
104129
}

graal-js/mx.graal-js/suite.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{
2525
"name" : "regex",
2626
"subdir" : True,
27-
"version" : "98324cbc2f65523695d6dfc0805e1da63c3fef4b",
27+
"version" : "3ecf62bb01af00121fad8f9b7b13ef5740e0695e",
2828
"urls" : [
2929
{"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
3030
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -60,18 +60,18 @@
6060

6161
"ICU4J" : {
6262
"moduleName" : "com.ibm.icu",
63-
"sha1" : "76893e6000401ace133a65262254be0ebe556d46",
64-
"sourceSha1" : "fae7d45fe56f4ef2a35ef6bd30245052268ffda1",
63+
"sha1" : "ff666ac55986650893aacb9e2e0003538e9799c0",
64+
"sourceSha1" : "3e19ca5465fce86a094c24df0b6c9256e53c8885",
6565
"maven" : {
6666
"groupId" : "com.ibm.icu",
6767
"artifactId" : "icu4j",
68-
"version" : "68.2",
68+
"version" : "69.1",
6969
},
7070
},
7171

7272
"TEST262" : {
73-
"sha1" : "1138fecf614625ac3f14e9cd9011ce1a5dd5105a",
74-
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/test262-d454b838.tar.bz2"],
73+
"sha1" : "7338157511a3b43e1df28f7f2c9cf87cb8be4f33",
74+
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/test262-a6a895db.tar.bz2"],
7575
},
7676

7777
"TESTNASHORN" : {
@@ -90,8 +90,8 @@
9090
},
9191

9292
"TESTV8" : {
93-
"sha1" : "464716ee065d14bc9b4d0b295c07d18999be2d8a",
94-
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/testv8-20210215.tar.gz"],
93+
"sha1" : "673bdf0bdbe943b99680873386ee1781e8c401df",
94+
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/testv8-20210709.tar.gz"],
9595
},
9696

9797
"JACKSON_CORE" : {

0 commit comments

Comments
 (0)