diff --git a/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/CoverageInfoPair.java b/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/CoverageInfoPair.java index 91c1dc6eb..3f41f0b6b 100644 --- a/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/CoverageInfoPair.java +++ b/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/CoverageInfoPair.java @@ -5,7 +5,6 @@ import static java.math.RoundingMode.HALF_EVEN; -import dev.ionfusion.fusion._private.HtmlWriter; import java.io.IOException; import java.math.BigDecimal; diff --git a/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/CoverageReportWriter.java b/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/CoverageReportWriter.java index 22ebff5ab..c95f390d4 100644 --- a/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/CoverageReportWriter.java +++ b/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/CoverageReportWriter.java @@ -14,8 +14,7 @@ import com.amazon.ion.SpanProvider; import com.amazon.ion.Timestamp; import com.amazon.ion.system.IonReaderBuilder; -import dev.ionfusion.fusion._private.HtmlWriter; -import dev.ionfusion.fusion._private.StreamWriter; +import dev.ionfusion.runtime._private.io.StreamWriter; import dev.ionfusion.runtime.base.ModuleIdentity; import dev.ionfusion.runtime.base.SourceLocation; import java.io.IOException; diff --git a/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/EstimatedCoverageInfoPair.java b/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/EstimatedCoverageInfoPair.java index dc90e57cf..a06a5ccc8 100644 --- a/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/EstimatedCoverageInfoPair.java +++ b/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/EstimatedCoverageInfoPair.java @@ -3,7 +3,6 @@ package dev.ionfusion.fusioncli.cover; -import dev.ionfusion.fusion._private.HtmlWriter; import java.io.IOException; class EstimatedCoverageInfoPair diff --git a/runtime/src/main/java/dev/ionfusion/fusion/_private/HtmlWriter.java b/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/HtmlWriter.java similarity index 98% rename from runtime/src/main/java/dev/ionfusion/fusion/_private/HtmlWriter.java rename to fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/HtmlWriter.java index 9c833125f..c42ab1b97 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/_private/HtmlWriter.java +++ b/fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/HtmlWriter.java @@ -1,8 +1,9 @@ // Copyright Ion Fusion contributors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package dev.ionfusion.fusion._private; +package dev.ionfusion.fusioncli.cover; +import dev.ionfusion.runtime._private.io.StreamWriter; import dev.ionfusion.runtime.base.ModuleIdentity; import java.io.IOException; diff --git a/fusioncli/src/main/java/dev/ionfusion/fusioncli/doc/tool/SiteBuilder.java b/fusioncli/src/main/java/dev/ionfusion/fusioncli/doc/tool/SiteBuilder.java index e2cda46c5..ba8be91f0 100644 --- a/fusioncli/src/main/java/dev/ionfusion/fusioncli/doc/tool/SiteBuilder.java +++ b/fusioncli/src/main/java/dev/ionfusion/fusioncli/doc/tool/SiteBuilder.java @@ -5,12 +5,12 @@ import static java.nio.file.Files.isDirectory; -import dev.ionfusion.fusion._private.StreamWriter; import dev.ionfusion.fusioncli.doc.site.FileCopyTemplate; import dev.ionfusion.fusioncli.doc.site.Site; import dev.ionfusion.fusioncli.doc.site.Template; import dev.ionfusion.fusioncli.doc.tool.layout.StreamingTemplate; import dev.ionfusion.fusioncli.doc.tool.mustache.MustacheTemplate; +import dev.ionfusion.runtime._private.io.StreamWriter; import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import dev.ionfusion.runtime.embed.TopLevel; diff --git a/fusioncli/src/main/java/dev/ionfusion/fusioncli/doc/tool/layout/StreamingTemplate.java b/fusioncli/src/main/java/dev/ionfusion/fusioncli/doc/tool/layout/StreamingTemplate.java index 262a07d21..9cc845889 100644 --- a/fusioncli/src/main/java/dev/ionfusion/fusioncli/doc/tool/layout/StreamingTemplate.java +++ b/fusioncli/src/main/java/dev/ionfusion/fusioncli/doc/tool/layout/StreamingTemplate.java @@ -3,10 +3,10 @@ package dev.ionfusion.fusioncli.doc.tool.layout; -import dev.ionfusion.fusion._private.StreamWriter; import dev.ionfusion.fusioncli.doc.site.Artifact; import dev.ionfusion.fusioncli.doc.site.Generator; import dev.ionfusion.fusioncli.doc.site.Template; +import dev.ionfusion.runtime._private.io.StreamWriter; import java.nio.file.Path; /** diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionSymbol.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionSymbol.java index 8902c7000..e99a741ec 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionSymbol.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionSymbol.java @@ -16,7 +16,7 @@ import com.amazon.ion.ValueFactory; import com.amazon.ion.util.IonTextUtils; import dev.ionfusion.fusion.FusionBool.BaseBool; -import dev.ionfusion.fusion._private.InternMap; +import dev.ionfusion.runtime._private.util.InternMap; import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.embed.TopLevel; diff --git a/runtime/src/main/java/dev/ionfusion/runtime/_private/cover/CoverageCollectorFactory.java b/runtime/src/main/java/dev/ionfusion/runtime/_private/cover/CoverageCollectorFactory.java index 8a2e73e3c..29e60ac86 100644 --- a/runtime/src/main/java/dev/ionfusion/runtime/_private/cover/CoverageCollectorFactory.java +++ b/runtime/src/main/java/dev/ionfusion/runtime/_private/cover/CoverageCollectorFactory.java @@ -6,7 +6,7 @@ import static java.nio.file.Files.createDirectories; import static java.nio.file.Files.isDirectory; -import dev.ionfusion.fusion._private.InternMap; +import dev.ionfusion.runtime._private.util.InternMap; import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.Path; diff --git a/runtime/src/main/java/dev/ionfusion/runtime/_private/cover/CoverageSession.java b/runtime/src/main/java/dev/ionfusion/runtime/_private/cover/CoverageSession.java index f11c55692..b2637b004 100644 --- a/runtime/src/main/java/dev/ionfusion/runtime/_private/cover/CoverageSession.java +++ b/runtime/src/main/java/dev/ionfusion/runtime/_private/cover/CoverageSession.java @@ -7,8 +7,8 @@ import static java.nio.file.Files.createTempFile; import dev.ionfusion.fusion._Private_CoverageCollector; -import dev.ionfusion.fusion._private.InternMap; import dev.ionfusion.runtime._private.util.Flusher; +import dev.ionfusion.runtime._private.util.InternMap; import dev.ionfusion.runtime.base.SourceLocation; import java.io.File; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/_private/StreamWriter.java b/runtime/src/main/java/dev/ionfusion/runtime/_private/io/StreamWriter.java similarity index 97% rename from runtime/src/main/java/dev/ionfusion/fusion/_private/StreamWriter.java rename to runtime/src/main/java/dev/ionfusion/runtime/_private/io/StreamWriter.java index d6c4dd171..22758b44f 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/_private/StreamWriter.java +++ b/runtime/src/main/java/dev/ionfusion/runtime/_private/io/StreamWriter.java @@ -1,7 +1,7 @@ // Copyright Ion Fusion contributors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package dev.ionfusion.fusion._private; +package dev.ionfusion.runtime._private.io; import static com.amazon.ion.system.IonTextWriterBuilder.UTF8; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/_private/InternMap.java b/runtime/src/main/java/dev/ionfusion/runtime/_private/util/InternMap.java similarity index 98% rename from runtime/src/main/java/dev/ionfusion/fusion/_private/InternMap.java rename to runtime/src/main/java/dev/ionfusion/runtime/_private/util/InternMap.java index 308af257f..75ef9a7d9 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/_private/InternMap.java +++ b/runtime/src/main/java/dev/ionfusion/runtime/_private/util/InternMap.java @@ -1,7 +1,7 @@ // Copyright Ion Fusion contributors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package dev.ionfusion.fusion._private; +package dev.ionfusion.runtime._private.util; import static java.util.Objects.requireNonNull; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/_private/InternMapTest.java b/runtime/src/test/java/dev/ionfusion/runtime/_private/util/InternMapTest.java similarity index 99% rename from runtime/src/test/java/dev/ionfusion/fusion/_private/InternMapTest.java rename to runtime/src/test/java/dev/ionfusion/runtime/_private/util/InternMapTest.java index e89a8aaae..e2419ef3b 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/_private/InternMapTest.java +++ b/runtime/src/test/java/dev/ionfusion/runtime/_private/util/InternMapTest.java @@ -1,7 +1,7 @@ // Copyright Ion Fusion contributors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package dev.ionfusion.fusion._private; +package dev.ionfusion.runtime._private.util; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotSame; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/_private/InternedString.java b/runtime/src/test/java/dev/ionfusion/runtime/_private/util/InternedString.java similarity index 93% rename from runtime/src/test/java/dev/ionfusion/fusion/_private/InternedString.java rename to runtime/src/test/java/dev/ionfusion/runtime/_private/util/InternedString.java index 7460f800a..44431ef22 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/_private/InternedString.java +++ b/runtime/src/test/java/dev/ionfusion/runtime/_private/util/InternedString.java @@ -1,7 +1,7 @@ // Copyright Ion Fusion contributors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package dev.ionfusion.fusion._private; +package dev.ionfusion.runtime._private.util; import java.util.Objects;