Skip to content

Commit b805099

Browse files
andrykonchineregon
authored andcommitted
[GR-54907] Backport changes in TruffleRuby master branch to the 24.1 release branch
PullRequest: truffleruby/4303
2 parents 13ae778 + c5645ca commit b805099

File tree

737 files changed

+9168
-4333
lines changed

Some content is hidden

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

737 files changed

+9168
-4333
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.2.4

CHANGELOG.md

Lines changed: 11 additions & 0 deletions

common.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.25.0",
7+
"mx_version": "7.25.5",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+20-1618", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+25-2038", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk11": {"name": "jpg-jdk", "version": "11.0.11", "build_id": "jdk-11.0.11+9", "platformspecific": true, "extrabundles": ["static-libs"] },
1414

@@ -45,13 +45,13 @@
4545
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21.0.2+13-jvmci-23.1-b33-sulong", "platformspecific": true },
4646
"graalvm-ee-21": {"name": "graalvm-java21", "version": "23.1.3", "platformspecific": true },
4747

48-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+23", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-23+23-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-23+23-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-23+23-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-23+23-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-23+23-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-23+23-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+26", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-23+26-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-23+26-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-23+26-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-23+26-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-23+26-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-23+26-jvmci-b01-sulong", "platformspecific": true }
5555
},
5656

5757
"eclipse": {

doc/contributor/how-to-guide.md

Lines changed: 2 additions & 2 deletions

doc/contributor/updating-ruby.md

Lines changed: 25 additions & 5 deletions

doc/legal/bundled_gems

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ rake 13.0.6 https://github.com/ruby/rake
55
test-unit 3.5.7 https://github.com/test-unit/test-unit
66
rexml 3.2.5 https://github.com/ruby/rexml
77
rss 0.2.9 https://github.com/ruby/rss
8-
net-ftp 0.2.0 https://github.com/ruby/net-ftp
9-
net-imap 0.3.4 https://github.com/ruby/net-imap
8+
net-ftp 0.2.1 https://github.com/ruby/net-ftp
9+
net-imap 0.3.4.1 https://github.com/ruby/net-imap
1010
net-pop 0.1.2 https://github.com/ruby/net-pop
11-
net-smtp 0.3.3 https://github.com/ruby/net-smtp
11+
net-smtp 0.3.4 https://github.com/ruby/net-smtp
1212
matrix 0.4.2 https://github.com/ruby/matrix
1313
prime 0.1.2 https://github.com/ruby/prime
1414
rbs 2.8.2 https://github.com/ruby/rbs

doc/legal/legal.md

Lines changed: 1 addition & 1 deletion

doc/user/compatibility.md

Lines changed: 1 addition & 1 deletion

doc/user/known-cves.md

Lines changed: 5 additions & 1 deletion

lib/cext/ABI_check.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
1

0 commit comments

Comments
 (0)