Turn common-polyglot-core-utils into JPMS module

enso-org · Jul 30, 2024 · 7e865ce · 7e865ce
1 parent 74f8111
commit 7e865ce
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/build.sbt b/build.sbt
@@ -3294,6 +3294,7 @@ lazy val `std-base` = project
 
 lazy val `common-polyglot-core-utils` = project
   .in(file("lib/scala/common-polyglot-core-utils"))
+  .enablePlugins(JPMSPlugin)
   .settings(
     frgaalJavaCompilerSetting,
     autoScalaLibrary := false,
@@ -3302,7 +3303,17 @@ lazy val `common-polyglot-core-utils` = project
     libraryDependencies ++= Seq(
       "com.ibm.icu"          % "icu4j"    % icuVersion,
       "org.graalvm.polyglot" % "polyglot" % graalMavenPackagesVersion % "provided"
-    )
+    ),
+    modulePath := {
+      JPMSUtils.filterModulesFromUpdate(
+        (Compile / update).value,
+        Seq(
+          "com.ibm.icu" % "icu4j" % icuVersion
+        ),
+        streams.value.log,
+        shouldContainAll = true
+      )
+    }
   )
 
 lazy val `enso-test-java-helpers` = project

diff --git a/lib/scala/common-polyglot-core-utils/src/main/java/module-info.java b/lib/scala/common-polyglot-core-utils/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+module org.enso.polyglot.common_utils {
+  exports org.enso.polyglot.common_utils;
+
+  requires com.ibm.icu;
+}