Skip to content

Commit d5e6cc9

Browse files
committed
[GR-19290] Update to Joni 2.1.30 and JCodings 1.0.45.
PullRequest: truffleruby/1183
2 parents 619dcbe + 1c2e23b commit d5e6cc9

File tree

6 files changed

+14
-16
lines changed

6 files changed

+14
-16
lines changed

3rd_party_licenses.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
4141
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SU
4242
================================================================================
4343

44-
JONI 2.1.25
44+
JONI 2.1.30
4545

4646
/*
4747
* Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -361,7 +361,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
361361
SUCH DAMAGE.
362362
================================================================================
363363

364-
JCodings 1.0.42
364+
JCodings 1.0.45
365365

366366
/*
367367
* Permission is hereby granted, free of charge, to any person obtaining a copy

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ Compatibility:
5050
* Implemented a native storage strategy for arrays to allow better C extension compatibility.
5151
* Implemented `rb_check_symbol_cstr` (#1814).
5252
* Implemented `rb_hash_start` (#1841, @XrXr).
53+
* JCodings has been updated from 1.0.42 to 1.0.45.
54+
* Joni has been updated from 2.1.25 to 2.1.30.
5355

5456
Performance:
5557

lib/truffle/rbconfig.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ module RbConfig
100100
'SOEXT' => Truffle::Platform::SOEXT.dup,
101101
'target_cpu' => host_cpu,
102102
'target_os' => host_os,
103+
'UNICODE_VERSION' => '12.0.0',
104+
'UNICODE_EMOJI_VERSION' => '12.0',
103105
}
104106

105107
MAKEFILE_CONFIG = CONFIG.dup

mx.truffleruby/suite.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,26 +63,22 @@
6363
"maven": {
6464
"groupId": "org.jruby.joni",
6565
"artifactId": "joni",
66-
"version": "2.1.25"
66+
"version": "2.1.30"
6767
},
68-
"sha1": "5dbb09787a9b8780737b71fbf942235ef59051b9",
69-
"sourceSha1": "505a09064f6e2209616f38724f6d97d8d889aa92",
70-
"license": [
71-
"MIT", # Joni
72-
],
68+
"sha1": "a23a567521996c2a412688763892cddbca7c3bd6",
69+
"sourceSha1": "a1444342fc0c275613d43ca3d0a71ce919d85b18",
70+
"license": ["MIT"],
7371
},
7472

7573
"JCODINGS": {
7674
"maven": {
7775
"groupId": "org.jruby.jcodings",
7876
"artifactId": "jcodings",
79-
"version": "1.0.40"
77+
"version": "1.0.45"
8078
},
81-
"sha1": "2838952e91baa37ac73ed817451268a193ba440a",
82-
"sourceSha1": "0ed89e096c83d540acac00d6ee3ea935b4c905ff",
83-
"license": [
84-
"MIT", # JCodings
85-
],
79+
"sha1": "029404c013b3d51a8c60fac80409bb3d64dfb816",
80+
"sourceSha1": "702693ea01e006385f2834ad56dad54b7a4ca248",
81+
"license": ["MIT"],
8682
},
8783
},
8884

spec/tags/library/rbconfig/unicode_emoji_version_tags.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

spec/tags/library/rbconfig/unicode_version_tags.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)