Switch to shaded JOni and JCodings library dependencies.

Author: woess

mx.truffleruby/mx_truffleruby.py

@@ -292,9 +292,9 @@ def ruby_maven_deploy_public(args):
         'truffleruby:TRUFFLERUBY-SHARED',
         'truffleruby:TRUFFLERUBY-ANNOTATIONS',
         'sdk:JLINE3',
-        # Libraries
-        'truffleruby:JCODINGS',
-        'truffleruby:JONI',
+        # Library distributions
+        'truffle:TRUFFLE_JCODINGS',
+        'truffleruby:TRUFFLERUBY_JONI',
     ],
     support_distributions=[
         'truffleruby:TRUFFLERUBY_GRAALVM_SUPPORT_PLATFORM_AGNOSTIC',

mx.truffleruby/suite.py

@@ -273,9 +273,9 @@
                 "sulong:SULONG_API",
                 "sulong:SULONG_NFI",
                 "sdk:JLINE3",
-                # Libraries, keep in sync with TRUFFLERUBY.exclude and truffle_jars (in mx_truffleruby.py)
-                "truffleruby:JCODINGS",
-                "truffleruby:JONI",
+                # Library distributions, keep in sync with truffle_jars in mx_truffleruby.py
+                "truffle:TRUFFLE_JCODINGS",
+                "truffleruby:TRUFFLERUBY_JONI",
             ],
             "annotationProcessors": [
                 "truffle:TRUFFLE_DSL_PROCESSOR",
@@ -543,14 +543,13 @@
                 "sulong:SULONG_API",
                 "sulong:SULONG_NFI",
                 "sdk:JLINE3",
+                # Library distributions, keep in sync with truffle_jars in mx_truffleruby.py
+                "truffle:TRUFFLE_JCODINGS",
+                "truffleruby:TRUFFLERUBY_JONI",
                 # runtime-only dependencies
                 "truffle:TRUFFLE_NFI_LIBFFI",
                 "sulong:SULONG_NATIVE",
             ],
-            "exclude": [ # Keep in sync with org.truffleruby dependencies and truffle_jars in mx_truffleruby.py
-                "truffleruby:JCODINGS",
-                "truffleruby:JONI",
-            ],
             "description": "Core module of Ruby on Truffle",
             "license": [
                 "EPL-2.0",          # JRuby (we're choosing EPL out of EPL,GPL,LGPL)