Moving all extra polyglot java import into a single file

enso-org · May 22, 2024 · aaa5e9e · aaa5e9e
1 parent d22357c
commit aaa5e9e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Ordering.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Ordering.enso
@@ -12,9 +12,6 @@ import project.Nothing.Nothing
 import project.Panic.Panic
 from project.Data.Boolean import Boolean, False, True
 
-# needed by Comparator_Spec:
-polyglot java import org.enso.base.ObjectComparator
-
 ## Provides custom ordering, equality check and hash code for types that need it.
 
    The Enso runtime system offers default implementation of _equality_

diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso
@@ -50,10 +50,6 @@ polyglot java import org.enso.base.text.Utf16Span
 polyglot java import org.enso.base.text.GraphemeSpan
 polyglot java import org.enso.base.text.ResultWithWarnings
 
-# needed by Util_Spec
-polyglot java import org.enso.base.text.CaseFoldedString
-polyglot java import org.enso.base.text.CaseFoldedString.Grapheme
-
 ## GROUP Text
    ICON text
    Returns a new `Text` object with the characters in the reverse order of the input.
@@ -545,7 +541,7 @@ Text.replace self term:(Text | Regex) replacement:Text (case_sensitivity:Case_Se
    Applies the specified cleansings to the text.
 
    Arguments:
-   - remove: A vector of the text cleanings to remove from the text. The text cleansings are 
+   - remove: A vector of the text cleanings to remove from the text. The text cleansings are
       applied in the order they are provided. The same text cleansing can be used multiple
       times. The text cleansings are:
       - ..Leading_Whitespace: Removes all whitspace from the start of the string.

diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/IO.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/IO.enso
@@ -2,9 +2,6 @@ import project.Any.Any
 import project.Data.Text.Text
 import project.Nothing.Nothing
 
-# needed for Standard.Test.Test_Reporter
-polyglot java import java.io.PrintStream
-
 ## PRIVATE
    ADVANCED
    Prints the provided message to standard error.

diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Internal/Extra_Imports.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Internal/Extra_Imports.enso
@@ -0,0 +1,16 @@
+private
+
+# this file contains additional imports necessary for
+# building native image version of Enso with Standard
+# libraries included in
+
+# needed for Standard.Test.Test_Reporter
+# tracked as https://github.com/enso-org/enso/issues/10028
+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.Grapheme
+
+# needed by Comparator_Spec:
+polyglot java import org.enso.base.ObjectComparator