Package libraries Java code as Java Modules

CHANGELOG.md

@@ -5,10 +5,12 @@
 - [Enforce conversion method return type][10468]
 - [Renaming launcher executable to ensoup][10535]
 - [Space-precedence does not apply to value-level operators][10597]
+- [Must specify `--repl` to enable debug server][10709]
 
 [10468]: https://github.com/enso-org/enso/pull/10468
 [10535]: https://github.com/enso-org/enso/pull/10535
 [10597]: https://github.com/enso-org/enso/pull/10597
+[10709]: https://github.com/enso-org/enso/pull/10709
 
 #### Enso IDE
 

build.sbt

@@ -3263,6 +3263,7 @@ val `std-snowflake-polyglot-root` =
 
 lazy val `std-base` = project
   .in(file("std-bits") / "base")
+  .enablePlugins(JPMSPlugin)
   .settings(
     frgaalJavaCompilerSetting,
     autoScalaLibrary := false,
@@ -3272,10 +3273,30 @@ lazy val `std-base` = project
     Compile / packageBin / artifactPath :=
       `base-polyglot-root` / "std-base.jar",
     libraryDependencies ++= Seq(
-      "org.graalvm.polyglot"       % "polyglot"                % graalMavenPackagesVersion,
-      "org.netbeans.api"           % "org-openide-util-lookup" % netbeansApiVersion % "provided",
-      "com.fasterxml.jackson.core" % "jackson-databind"        % jacksonVersion
+      "org.graalvm.polyglot"       % "polyglot"         % graalMavenPackagesVersion,
+      "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion
     ),
+    modulePath := {
+      val updateReport = (Compile / update).value
+      val requiredModIds = Seq(
+        "org.graalvm.polyglot"       % "polyglot"            % graalMavenPackagesVersion,
+        "org.graalvm.sdk"            % "collections"         % graalMavenPackagesVersion,
+        "com.ibm.icu"                % "icu4j"               % icuVersion,
+        "com.fasterxml.jackson.core" % "jackson-databind"    % jacksonVersion,
+        "com.fasterxml.jackson.core" % "jackson-annotations" % jacksonVersion,
+        "com.fasterxml.jackson.core" % "jackson-core"        % jacksonVersion
+      )
+      val externalRequiredMods = JPMSUtils.filterModulesFromUpdate(
+        updateReport,
+        requiredModIds,
+        streams.value.log,
+        shouldContainAll = true
+      )
+      val ourRequiredMods =
+        (`common-polyglot-core-utils` / Compile / exportedProducts).value
+          .map(_.data)
+      externalRequiredMods ++ ourRequiredMods
+    },
     Compile / packageBin := Def.task {
       val result = (Compile / packageBin).value
       val _ensureCoreIsCompiled =
@@ -3294,6 +3315,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 +3324,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
@@ -3373,6 +3405,7 @@ lazy val `benchmark-java-helpers` = project
 lazy val `std-table` = project
   .in(file("std-bits") / "table")
   .enablePlugins(Antlr4Plugin)
+  .enablePlugins(JPMSPlugin)
   .settings(
     frgaalJavaCompilerSetting,
     autoScalaLibrary := false,
@@ -3397,6 +3430,33 @@ lazy val `std-table` = project
       "org.antlr"                % "antlr4-runtime"          % antlrVersion,
       "org.apache.logging.log4j" % "log4j-to-slf4j"          % "2.18.0" // org.apache.poi uses log4j
     ),
+    modulePath := {
+      val updateReport = (Compile / update).value
+      val requiredModIds = Seq(
+        "org.graalvm.polyglot" % "polyglot"                % graalMavenPackagesVersion,
+        "org.antlr"            % "antlr4-runtime"          % antlrVersion,
+        "com.univocity"        % "univocity-parsers"       % univocityParsersVersion,
+        "org.apache.poi"       % "poi"                     % poiOoxmlVersion,
+        "org.apache.poi"       % "poi-ooxml"               % poiOoxmlVersion,
+        "org.apache.poi"       % "poi-ooxml-lite"          % poiOoxmlVersion,
+        "org.apache.xmlbeans"  % "xmlbeans"                % xmlbeansVersion,
+        "org.graalvm.sdk"      % "collections"             % graalMavenPackagesVersion,
+        "com.ibm.icu"          % "icu4j"                   % icuVersion,
+        "org.netbeans.api"     % "org-openide-util-lookup" % netbeansApiVersion
+      )
+      val externalRequiredMods = JPMSUtils.filterModulesFromUpdate(
+        updateReport,
+        requiredModIds,
+        streams.value.log,
+        shouldContainAll = true
+      )
+      val ourRequiredMods =
+        (`common-polyglot-core-utils` / Compile / exportedProducts).value
+          .map(_.data) ++
+        (`std-base` / Compile / exportedProducts).value
+          .map(_.data)
+      externalRequiredMods ++ ourRequiredMods
+    },
     Compile / packageBin := Def.task {
       val result = (Compile / packageBin).value
       val _ = StdBits
@@ -3470,6 +3530,7 @@ lazy val `std-google-api` = project
 
 lazy val `std-database` = project
   .in(file("std-bits") / "database")
+  .enablePlugins(JPMSPlugin)
   .settings(
     frgaalJavaCompilerSetting,
     autoScalaLibrary := false,
@@ -3479,11 +3540,29 @@ lazy val `std-database` = project
     Compile / packageBin / artifactPath :=
       `database-polyglot-root` / "std-database.jar",
     libraryDependencies ++= Seq(
-      "org.graalvm.polyglot" % "polyglot"                % graalMavenPackagesVersion % "provided",
-      "org.netbeans.api"     % "org-openide-util-lookup" % netbeansApiVersion        % "provided",
-      "org.xerial"           % "sqlite-jdbc"             % sqliteVersion,
-      "org.postgresql"       % "postgresql"              % "42.4.0"
+      "org.graalvm.polyglot" % "polyglot"    % graalMavenPackagesVersion % "provided",
+      "org.xerial"           % "sqlite-jdbc" % sqliteVersion,
+      "org.postgresql"       % "postgresql"  % "42.4.0"
     ),
+    modulePath := {
+      val externalModIds = libraryDependencies.value ++ Seq(
+        "org.graalvm.sdk"            % "collections"         % graalMavenPackagesVersion,
+        "com.fasterxml.jackson.core" % "jackson-databind"    % jacksonVersion,
+        "com.fasterxml.jackson.core" % "jackson-annotations" % jacksonVersion,
+        "com.fasterxml.jackson.core" % "jackson-core"        % jacksonVersion
+      )
+      val externalMods = JPMSUtils.filterModulesFromUpdate(
+        (Compile / update).value,
+        externalModIds,
+        streams.value.log,
+        shouldContainAll = true
+      )
+      val ourMods =
+        (`std-base` / Compile / exportedProducts).value.map(_.data) ++
+        (`common-polyglot-core-utils` / Compile / exportedProducts).value
+          .map(_.data)
+      externalMods ++ ourMods
+    },
     Compile / packageBin := Def.task {
       val result = (Compile / packageBin).value
       val _ = StdBits
@@ -3501,6 +3580,7 @@ lazy val `std-database` = project
 
 lazy val `std-aws` = project
   .in(file("std-bits") / "aws")
+  .enablePlugins(JPMSPlugin)
   .settings(
     frgaalJavaCompilerSetting,
     autoScalaLibrary := false,
@@ -3510,17 +3590,40 @@ lazy val `std-aws` = project
     Compile / packageBin / artifactPath :=
       `std-aws-polyglot-root` / "std-aws.jar",
     libraryDependencies ++= Seq(
-      "org.netbeans.api"       % "org-openide-util-lookup" % netbeansApiVersion % "provided",
-      "com.amazon.redshift"    % "redshift-jdbc42"         % redshiftVersion,
-      "com.amazonaws"          % "aws-java-sdk-core"       % awsJavaSdkV1Version,
-      "com.amazonaws"          % "aws-java-sdk-redshift"   % awsJavaSdkV1Version,
-      "com.amazonaws"          % "aws-java-sdk-sts"        % awsJavaSdkV1Version,
-      "software.amazon.awssdk" % "auth"                    % awsJavaSdkV2Version,
-      "software.amazon.awssdk" % "bom"                     % awsJavaSdkV2Version,
-      "software.amazon.awssdk" % "s3"                      % awsJavaSdkV2Version,
-      "software.amazon.awssdk" % "sso"                     % awsJavaSdkV2Version,
-      "software.amazon.awssdk" % "ssooidc"                 % awsJavaSdkV2Version
+      "com.amazon.redshift"    % "redshift-jdbc42"       % redshiftVersion,
+      "com.amazonaws"          % "aws-java-sdk-core"     % awsJavaSdkV1Version,
+      "com.amazonaws"          % "aws-java-sdk-redshift" % awsJavaSdkV1Version,
+      "com.amazonaws"          % "aws-java-sdk-sts"      % awsJavaSdkV1Version,
+      "software.amazon.awssdk" % "auth"                  % awsJavaSdkV2Version,
+      "software.amazon.awssdk" % "bom"                   % awsJavaSdkV2Version,
+      "software.amazon.awssdk" % "s3"                    % awsJavaSdkV2Version,
+      "software.amazon.awssdk" % "sso"                   % awsJavaSdkV2Version,
+      "software.amazon.awssdk" % "ssooidc"               % awsJavaSdkV2Version
     ),
+    modulePath := {
+      val externalModIds = Seq(
+        "com.amazon.redshift"    % "redshift-jdbc42" % redshiftVersion,
+        "software.amazon.awssdk" % "auth"            % awsJavaSdkV2Version,
+        "software.amazon.awssdk" % "s3"              % awsJavaSdkV2Version,
+        "software.amazon.awssdk" % "sso"             % awsJavaSdkV2Version,
+        "software.amazon.awssdk" % "ssooidc"         % awsJavaSdkV2Version,
+        "software.amazon.awssdk" % "http-client-spi" % awsJavaSdkV2Version,
+        "software.amazon.awssdk" % "regions"         % awsJavaSdkV2Version,
+        "software.amazon.awssdk" % "sdk-core"        % awsJavaSdkV2Version,
+        "software.amazon.awssdk" % "profiles"        % awsJavaSdkV2Version,
+        "software.amazon.awssdk" % "aws-core"        % awsJavaSdkV2Version
+      )
+      val externalMods = JPMSUtils.filterModulesFromUpdate(
+        (Compile / update).value,
+        externalModIds,
+        streams.value.log,
+        shouldContainAll = true
+      )
+      val ourMods =
+        (`std-base` / Compile / exportedProducts).value.map(_.data) ++
+        (`std-database` / Compile / exportedProducts).value.map(_.data)
+      externalMods ++ ourMods
+    },
     Compile / packageBin := Def.task {
       val result = (Compile / packageBin).value
       val _ = StdBits

build/build/src/enso.rs

@@ -100,6 +100,9 @@ impl BuiltEnso {
             // This flag enables assertions in the JVM. Some of our stdlib tests had in the past
             // failed on Graal/Truffle assertions, so we want to have them triggered.
             .set_env(JAVA_OPTS, &ide_ci::programs::java::Option::EnableAssertions.as_ref())?;
+        if test_path.as_str().contains("_Internal_") {
+            command.arg("--disable-private-check");
+        }
         Ok(command)
     }
 

distribution/lib/Standard/Base/0.0.0-dev/src/Internal/Extra_Imports.enso

@@ -9,11 +9,10 @@ private
 polyglot java import java.io.PrintStream
 
 # needed by Util_Spec
-polyglot java import org.enso.base.text.CaseFoldedString
+polyglot java import org.enso.base.text.CaseFoldedString as JCaseFoldedString
 polyglot java import org.enso.base.text.CaseFoldedString.Grapheme
-
-# needed by Comparator_Spec:
-polyglot java import org.enso.base.ObjectComparator
+polyglot java import org.enso.base.Text_Utils as JText_Utils
+polyglot java import com.ibm.icu.text.BreakIterator as JBreakIterator
 
 # often used in tests
 polyglot java import java.util.ArrayList
@@ -26,6 +25,21 @@ polyglot java import java.math.BigInteger
 polyglot java import java.time.LocalDate
 polyglot java import java.time.LocalDateTime
 polyglot java import java.util.function.Function
+polyglot java import java.lang.Exception as JException
 polyglot java import java.lang.Thread
 polyglot java import java.lang.Thread.State
 polyglot java import java.lang.Float
+
+polyglot java import org.enso.base.Stream_Utils as JStream_Utils
+polyglot java import org.enso.base.file_system.File_Utils as JFile_Utils
+polyglot java import org.enso.base.CompareException as JCompareException
+polyglot java import org.enso.base.ObjectComparator as JObjectComparator
+
+Stream_Utils=JStream_Utils
+File_Utils=JFile_Utils
+CompareException=JCompareException
+ObjectComparator=JObjectComparator
+CaseFoldedString=JCaseFoldedString
+Text_Utils=JText_Utils
+BreakIterator=JBreakIterator
+Exception=JException

distribution/lib/Standard/Base/0.0.0-dev/src/Meta.enso

@@ -13,7 +13,6 @@ import project.Error.Error as Base_Error
 import project.Errors.Common.Not_Found
 import project.Function.Function
 import project.Nothing.Nothing
-import project.Polyglot.Java
 from project.Data.Boolean import Boolean, False, True
 from project.Runtime.Managed_Resource import Managed_Resource
 
@@ -445,7 +444,7 @@ is_a value typ = @Builtin_Method "Meta.is_a"
 java_instance_check value typ =
     val_java = get_polyglot_language value == "java"
     typ_java = get_polyglot_language typ == "java"
-    val_java && typ_java && Java.is_instance value typ
+    val_java && typ_java && typ.class.isInstance value
 
 ## PRIVATE
    ADVANCED

distribution/lib/Standard/Base/0.0.0-dev/src/Polyglot.enso

@@ -132,50 +132,3 @@ type Polyglot
        Returns the executable name of a polyglot object.
     get_executable_name : Any -> Text
     get_executable_name value = @Builtin_Method "Polyglot.get_executable_name"
-
-## Utilities for working with Java polyglot objects.
-type Java
-    ## PRIVATE
-       ADVANCED
-       Adds the provided entry to the host class path.
-
-       Arguments:
-       - path: The java classpath entry to add.
-
-       Use of the actual polyglot imports system should be preferred to use of
-       this method.
-
-       > Example
-         Adding Random to the classpath.
-
-            Java.add_to_class_path "java.util.Random"
-    add_to_class_path : Text -> Nothing
-    add_to_class_path path = @Builtin_Method "Java.add_to_class_path"
-
-    ## PRIVATE
-       ADVANCED
-       Looks up a java symbol on the classpath by name.
-
-       Arguments:
-       - name: The name of the java symbol to look up.
-
-       Use of the actual polyglot imports system should be preferred to use of
-       this method.
-
-       > Example
-         Look up java's Random class.
-
-             Java.lookup_class "java.util.Random"
-    lookup_class : Text -> Any
-    lookup_class name = @Builtin_Method "Java.lookup_class"
-
-    ## PRIVATE
-       Checks whether an object is an instance of a given class.
-
-       Arguments:
-       - object: The object to check for class membership.
-       - class: The java class to check for membership in.
-    is_instance : Any -> Any -> Boolean
-    is_instance object class =
-        class_object = class.class
-        class_object.isInstance object