|
20 | 20 | {
|
21 | 21 | "name": "regex",
|
22 | 22 | "subdir": True,
|
23 |
| - "version": "d6243acce05af06b17d63dddb2972e739141dc6d", |
| 23 | + "version": "3f39def1e63211bae1359722528902f979a8afcf", |
24 | 24 | "urls": [
|
25 | 25 | {"url": "https://github.com/oracle/graal.git", "kind": "git"},
|
26 | 26 | {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
|
|
29 | 29 | {
|
30 | 30 | "name": "sulong",
|
31 | 31 | "subdir": True,
|
32 |
| - "version": "d6243acce05af06b17d63dddb2972e739141dc6d", |
| 32 | + "version": "3f39def1e63211bae1359722528902f979a8afcf", |
33 | 33 | "urls": [
|
34 | 34 | {"url": "https://github.com/oracle/graal.git", "kind": "git"},
|
35 | 35 | {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
|
|
69 | 69 |
|
70 | 70 | # ------------- Libraries -------------
|
71 | 71 |
|
72 |
| - "JCODINGS": { |
73 |
| - "moduleName": "org.jruby.jcodings", |
74 |
| - "maven": { |
75 |
| - "groupId": "org.jruby.jcodings", |
76 |
| - "artifactId": "jcodings", |
77 |
| - "version": "1.0.58" |
78 |
| - }, |
79 |
| - "digest": "sha512:625210aa07d1e08bf2f5fdc9da6c491a4e5a56e7db297cba1aa73636670ac1d62f3fd763716ef6ede862456b17169272ed9c8461d07100f95262163dc9c18ef8", |
80 |
| - "sourceDigest": "sha512:d0f883f658310f7ad091aea08df28f1f5fe12080d6cb266cd91aec7e34cda1d57736d32618e8632b329854367d6e4d5fc91b5eb8ac9b823b26113fae3f75f50c", |
81 |
| - "license": ["MIT"], |
82 |
| - }, |
83 |
| - |
84 | 72 | "JONI": {
|
85 | 73 | "moduleName": "org.jruby.joni",
|
86 | 74 | "maven": {
|
|
273 | 261 | "sulong:SULONG_API",
|
274 | 262 | "sulong:SULONG_NFI",
|
275 | 263 | "sdk:JLINE3",
|
276 |
| - # Libraries, keep in sync with TRUFFLERUBY.exclude and truffle_jars (in mx_truffleruby.py) |
277 |
| - "truffleruby:JCODINGS", |
278 |
| - "truffleruby:JONI", |
| 264 | + # Library distributions, keep in sync with truffle_jars in mx_truffleruby.py |
| 265 | + "truffle:TRUFFLE_JCODINGS", |
| 266 | + "truffleruby:TRUFFLERUBY_JONI", |
279 | 267 | ],
|
280 | 268 | "annotationProcessors": [
|
281 | 269 | "truffle:TRUFFLE_DSL_PROCESSOR",
|
|
424 | 412 | "BSD-simplified", # MRI
|
425 | 413 | ],
|
426 | 414 | },
|
| 415 | + |
| 416 | + "org.graalvm.shadowed.org.joni": { |
| 417 | + # Shadowed JONI library (org.jruby.joni:joni) |
| 418 | + "dir": "src/shadowed/joni", |
| 419 | + "sourceDirs": ["java"], |
| 420 | + "javaCompliance": "17+", |
| 421 | + "spotbugsIgnoresGenerated": True, |
| 422 | + "dependencies": [ |
| 423 | + "truffle:TRUFFLE_JCODINGS", |
| 424 | + ], |
| 425 | + "shadedDependencies": [ |
| 426 | + "truffleruby:JONI", |
| 427 | + ], |
| 428 | + "class": "ShadedLibraryProject", |
| 429 | + "shade": { |
| 430 | + "packages": { |
| 431 | + "org.joni": "org.graalvm.shadowed.org.joni", |
| 432 | + "org.jcodings": "org.graalvm.shadowed.org.jcodings", |
| 433 | + }, |
| 434 | + "exclude": [ |
| 435 | + "META-INF/MANIFEST.MF", |
| 436 | + "META-INF/maven/org.jruby.joni/joni/*", # pom.xml, pom.properties |
| 437 | + "module-info.java", |
| 438 | + "org/joni/bench/*.java", |
| 439 | + ], |
| 440 | + }, |
| 441 | + "description": "JOni library shadowed for TruffleRuby.", |
| 442 | + # We need to force javac because the generated sources in this project produce warnings in JDT. |
| 443 | + "forceJavac": "true", |
| 444 | + "javac.lint.overrides": "none", |
| 445 | + "jacoco": "exclude", |
| 446 | + }, |
427 | 447 | },
|
428 | 448 |
|
429 | 449 | "distributions": {
|
|
511 | 531 | "sulong:SULONG_API",
|
512 | 532 | "sulong:SULONG_NFI",
|
513 | 533 | "sdk:JLINE3",
|
| 534 | + # Library distributions, keep in sync with truffle_jars in mx_truffleruby.py |
| 535 | + "truffle:TRUFFLE_JCODINGS", |
| 536 | + "truffleruby:TRUFFLERUBY_JONI", |
514 | 537 | # runtime-only dependencies
|
515 | 538 | "truffle:TRUFFLE_NFI_LIBFFI",
|
516 | 539 | "sulong:SULONG_NATIVE",
|
517 | 540 | ],
|
518 |
| - "exclude": [ # Keep in sync with org.truffleruby dependencies and truffle_jars in mx_truffleruby.py |
519 |
| - "truffleruby:JCODINGS", |
520 |
| - "truffleruby:JONI", |
521 |
| - ], |
522 | 541 | "description": "Core module of Ruby on Truffle",
|
523 | 542 | "license": [
|
524 | 543 | "EPL-2.0", # JRuby (we're choosing EPL out of EPL,GPL,LGPL)
|
|
859 | 878 | },
|
860 | 879 | "noMavenJavadoc": True,
|
861 | 880 | },
|
| 881 | + |
| 882 | + "TRUFFLERUBY_JONI": { |
| 883 | + # JONI library shadowed for TruffleRuby. |
| 884 | + "moduleInfo": { |
| 885 | + "name": "org.graalvm.shadowed.joni", |
| 886 | + "requires": [ |
| 887 | + "org.graalvm.shadowed.jcodings", |
| 888 | + ], |
| 889 | + "exports": [ |
| 890 | + "org.graalvm.shadowed.org.joni to org.graalvm.ruby", |
| 891 | + "org.graalvm.shadowed.org.joni.constants to org.graalvm.ruby", |
| 892 | + "org.graalvm.shadowed.org.joni.exception to org.graalvm.ruby", |
| 893 | + ], |
| 894 | + }, |
| 895 | + "javaCompliance": "17+", |
| 896 | + "dependencies": [ |
| 897 | + "org.graalvm.shadowed.org.joni", |
| 898 | + ], |
| 899 | + "distDependencies": [ |
| 900 | + "truffle:TRUFFLE_JCODINGS", |
| 901 | + ], |
| 902 | + "description": "JOni module shadowed for TruffleRuby.", |
| 903 | + "license": ["MIT"], |
| 904 | + "maven": { |
| 905 | + "groupId": "org.graalvm.shadowed", |
| 906 | + "artifactId": "joni", |
| 907 | + "tag": ["default", "public"], |
| 908 | + }, |
| 909 | + "allowsJavadocWarnings": True, |
| 910 | + "compress": True, |
| 911 | + }, |
862 | 912 | },
|
863 | 913 | }
|
0 commit comments