[GR-46394] Migrate TruffleRuby to named Java modules

PullRequest: truffleruby/3900
oracle · Jul 18, 2023 · fd0689c · fd0689c
2 parents b64cd1d + 1879e26
commit fd0689c
Showing 1 changed file with 28 additions and 2 deletions.
diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -57,6 +57,7 @@
         # ------------- Libraries -------------
 
         "JCODINGS": {
+            "moduleName": "org.jruby.jcodings",
             "maven": {
                 "groupId": "org.jruby.jcodings",
                 "artifactId": "jcodings",
@@ -68,6 +69,7 @@
         },
 
         "JONI": {
+            "moduleName": "org.jruby.joni",
             "maven": {
                 "groupId": "org.jruby.joni",
                 "artifactId": "joni",
@@ -384,6 +386,12 @@
         # ------------- Distributions -------------
 
         "TRUFFLERUBY-ANNOTATIONS": {
+            "moduleInfo": {
+                "name": "org.graalvm.ruby.annotations",
+                "exports": [
+                    "org.truffleruby.annotations to org.graalvm.ruby",
+                ],
+            },
             "dependencies": [
                 "org.truffleruby.annotations"
             ],
@@ -395,6 +403,13 @@
         # since the rest cannot depend on the launcher and the shared code cannot be there.
         # This code is loaded twice in different classloaders, therefore any created instances should not be passed around.
         "TRUFFLERUBY-SHARED": {
+            "moduleInfo": {
+                "name": "org.graalvm.ruby.shared",
+                "exports": [
+                    "org.truffleruby.shared",
+                    "org.truffleruby.shared.options",
+                ],
+            },
             "dependencies": [
                 "org.truffleruby.shared"
             ],
@@ -420,8 +435,10 @@
 
         "TRUFFLERUBY-SERVICES": {
             "moduleInfo": {
-                "name": "org.truffleruby.services",
-                "exports": ["org.truffleruby.services.scriptengine"],
+                "name": "org.graalvm.ruby.services",
+                "exports": [
+                    "org.truffleruby.services.scriptengine",
+                ],
             },
             "dependencies": [
                 "org.truffleruby.services"
@@ -434,6 +451,9 @@
         },
 
         "TRUFFLERUBY": {
+            "moduleInfo": {
+                "name": "org.graalvm.ruby",
+            },
             "dependencies": [
                 "org.truffleruby",
                 "org.truffleruby.ruby",
@@ -471,6 +491,12 @@
         },
 
         "TRUFFLERUBY-LAUNCHER": {
+            "moduleInfo": {
+                "name": "org.graalvm.ruby.launcher",
+                "exports": [
+                    "org.truffleruby.launcher to org.graalvm.launcher",
+                ],
+            },
             "dependencies": [
                 "org.truffleruby.launcher"
             ],