diff --git a/aot-maven-plugin/pom.xml b/aot-maven-plugin/pom.xml index 177fa3dd0..f9f15cd70 100644 --- a/aot-maven-plugin/pom.xml +++ b/aot-maven-plugin/pom.xml @@ -29,7 +29,6 @@ com.github.javaparser javaparser-core - ${javaparser.version} org.apache.maven diff --git a/bom/pom.xml b/bom/pom.xml index 488885c00..96250767e 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -16,7 +16,7 @@ com.dylibso.chicory - function-annotations + host-module-annotations ${project.version} diff --git a/function-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/function-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor deleted file mode 100644 index 21917dfa0..000000000 --- a/function-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ /dev/null @@ -1 +0,0 @@ -com.dylibso.chicory.function.processor.FunctionProcessor diff --git a/function-annotations/pom.xml b/host-module/annotations/pom.xml similarity index 68% rename from function-annotations/pom.xml rename to host-module/annotations/pom.xml index aab836388..9e92e58c9 100644 --- a/function-annotations/pom.xml +++ b/host-module/annotations/pom.xml @@ -4,13 +4,13 @@ com.dylibso.chicory - chicory + host-module-parent 999-SNAPSHOT ../pom.xml - function-annotations + host-module-annotations jar - Chicory - Function annotations - Experimental annotations for host functions + Chicory - Host Module annotations + Experimental annotations for host modules diff --git a/function-annotations/src/main/java/com/dylibso/chicory/function/annotations/Buffer.java b/host-module/annotations/src/main/java/com/dylibso/chicory/hostmodule/annotations/Buffer.java similarity index 83% rename from function-annotations/src/main/java/com/dylibso/chicory/function/annotations/Buffer.java rename to host-module/annotations/src/main/java/com/dylibso/chicory/hostmodule/annotations/Buffer.java index c7df67ebe..26c04af7b 100644 --- a/function-annotations/src/main/java/com/dylibso/chicory/function/annotations/Buffer.java +++ b/host-module/annotations/src/main/java/com/dylibso/chicory/hostmodule/annotations/Buffer.java @@ -1,4 +1,4 @@ -package com.dylibso.chicory.function.annotations; +package com.dylibso.chicory.hostmodule.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/function-annotations/src/main/java/com/dylibso/chicory/function/annotations/CString.java b/host-module/annotations/src/main/java/com/dylibso/chicory/hostmodule/annotations/CString.java similarity index 83% rename from function-annotations/src/main/java/com/dylibso/chicory/function/annotations/CString.java rename to host-module/annotations/src/main/java/com/dylibso/chicory/hostmodule/annotations/CString.java index f55218d17..acc5273e9 100644 --- a/function-annotations/src/main/java/com/dylibso/chicory/function/annotations/CString.java +++ b/host-module/annotations/src/main/java/com/dylibso/chicory/hostmodule/annotations/CString.java @@ -1,4 +1,4 @@ -package com.dylibso.chicory.function.annotations; +package com.dylibso.chicory.hostmodule.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/function-annotations/src/main/java/com/dylibso/chicory/function/annotations/HostModule.java b/host-module/annotations/src/main/java/com/dylibso/chicory/hostmodule/annotations/HostModule.java similarity index 84% rename from function-annotations/src/main/java/com/dylibso/chicory/function/annotations/HostModule.java rename to host-module/annotations/src/main/java/com/dylibso/chicory/hostmodule/annotations/HostModule.java index fc9045448..f038d542c 100644 --- a/function-annotations/src/main/java/com/dylibso/chicory/function/annotations/HostModule.java +++ b/host-module/annotations/src/main/java/com/dylibso/chicory/hostmodule/annotations/HostModule.java @@ -1,4 +1,4 @@ -package com.dylibso.chicory.function.annotations; +package com.dylibso.chicory.hostmodule.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/function-annotations/src/main/java/com/dylibso/chicory/function/annotations/WasmExport.java b/host-module/annotations/src/main/java/com/dylibso/chicory/hostmodule/annotations/WasmExport.java similarity index 84% rename from function-annotations/src/main/java/com/dylibso/chicory/function/annotations/WasmExport.java rename to host-module/annotations/src/main/java/com/dylibso/chicory/hostmodule/annotations/WasmExport.java index ec488202a..c560c58fc 100644 --- a/function-annotations/src/main/java/com/dylibso/chicory/function/annotations/WasmExport.java +++ b/host-module/annotations/src/main/java/com/dylibso/chicory/hostmodule/annotations/WasmExport.java @@ -1,4 +1,4 @@ -package com.dylibso.chicory.function.annotations; +package com.dylibso.chicory.hostmodule.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/host-module/it/pom.xml b/host-module/it/pom.xml new file mode 100644 index 000000000..2fcf152a1 --- /dev/null +++ b/host-module/it/pom.xml @@ -0,0 +1,99 @@ + + + 4.0.0 + + + com.dylibso.chicory + host-module-parent + 999-SNAPSHOT + ../pom.xml + + host-module-it + jar + Chicory - Host Module - IT + Integration tests for the Chicory annotations + + + + com.dylibso.chicory + host-module-processor + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.dylibso.chicory:host-module-processor + + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + + + ${project.basedir} + ${project.version} + + + + + + integration-test + verify + + + + + + org.apache.maven.plugins + maven-invoker-plugin + ${maven-invoker-plugin.version} + + ${project.build.directory}/it + true + src/it/settings.xml + verify + true + ${skipTests} + true + invoker.properties + + ${project.version} + ${project.artifactId} + ${project.groupId} + + + + + integration-tests + + install + run + + + + + + + org.codehaus.mojo + templating-maven-plugin + 3.0.0 + + + filtering-java-templates + + filter-sources + + + + + + + diff --git a/host-module/it/src/it/settings.xml b/host-module/it/src/it/settings.xml new file mode 100644 index 000000000..2d90068bb --- /dev/null +++ b/host-module/it/src/it/settings.xml @@ -0,0 +1,35 @@ + + + + + it-repo + + true + + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + diff --git a/host-module/it/src/it/with-imports/invoker.properties b/host-module/it/src/it/with-imports/invoker.properties new file mode 100644 index 000000000..84099bc5a --- /dev/null +++ b/host-module/it/src/it/with-imports/invoker.properties @@ -0,0 +1 @@ +invoker.goals=test diff --git a/host-module/it/src/it/with-imports/pom.xml b/host-module/it/src/it/with-imports/pom.xml new file mode 100644 index 000000000..7307e8d24 --- /dev/null +++ b/host-module/it/src/it/with-imports/pom.xml @@ -0,0 +1,73 @@ + + + + 4.0.0 + com.dylibso.chicory + + with-imports-chicory-it + 0.0-SNAPSHOT + jar + + + @maven.compiler.release@ + + + + + com.dylibso.chicory + host-module-annotations + @project.version@ + + + com.dylibso.chicory + runtime + @project.version@ + + + com.dylibso.chicory + host-module-processor + @project.version@ + provided + + + com.dylibso.chicory + wasm-corpus + @project.version@ + test + + + + org.junit.jupiter + junit-jupiter-api + @junit.version@ + test + + + org.junit.jupiter + junit-jupiter-engine + @junit.version@ + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + @maven-compiler-plugin.version@ + + ${maven.compiler.release} + + + com.dylibso.chicory + host-module-processor + @project.version@ + + + + + + + + diff --git a/host-module/it/src/it/with-imports/src/test/java/chicory/test/WithImportsTest.java b/host-module/it/src/it/with-imports/src/test/java/chicory/test/WithImportsTest.java new file mode 100644 index 000000000..b1ece8313 --- /dev/null +++ b/host-module/it/src/it/with-imports/src/test/java/chicory/test/WithImportsTest.java @@ -0,0 +1,58 @@ +package chicory.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import com.dylibso.chicory.hostmodule.annotations.HostModule; +import com.dylibso.chicory.hostmodule.annotations.WasmExport; +import com.dylibso.chicory.runtime.ExternalValues; +import com.dylibso.chicory.runtime.Instance; +import com.dylibso.chicory.wasm.Parser; +import java.util.concurrent.atomic.AtomicInteger; +import org.junit.jupiter.api.Test; + +class WithImportsTest { + public final AtomicInteger count = new AtomicInteger(); + + @HostModule("console") + class TestModule { + private static final String EXPECTED = "Hello, World!"; + private final Instance instance; + + public TestModule() { + instance = + Instance.builder( + Parser.parse( + WithImportsTest.class.getResourceAsStream( + "/compiled/host-function.wat.wasm"))) + .withExternalValues( + new ExternalValues( + TestModule_ModuleFactory.toHostFunctions(this))) + .build(); + } + + public void logIt() { + instance.export("logIt").apply(); + } + + @WasmExport + public void log(int len, int offset) { + var message = instance.memory().readString(offset, len); + + if (EXPECTED.equals(message)) { + count.incrementAndGet(); + } + } + } + + @Test + public void withImportsModule() { + // Arrange + var withImportsModule = new TestModule(); + + // Act + withImportsModule.logIt(); + + // Assert + assertEquals(10, count.get()); + } +} diff --git a/host-module/pom.xml b/host-module/pom.xml new file mode 100644 index 000000000..aa8c05b3d --- /dev/null +++ b/host-module/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + + com.dylibso.chicory + chicory + 999-SNAPSHOT + ../pom.xml + + host-module-parent + pom + Chicory - Host Module - Parent + Parent module for the Host Module machinery + + + annotations + it + processor + + + diff --git a/function-processor/pom.xml b/host-module/processor/pom.xml similarity index 89% rename from function-processor/pom.xml rename to host-module/processor/pom.xml index 6276a0f52..69dd87562 100644 --- a/function-processor/pom.xml +++ b/host-module/processor/pom.xml @@ -4,19 +4,19 @@ com.dylibso.chicory - chicory + host-module-parent 999-SNAPSHOT ../pom.xml - function-processor + host-module-processor jar - Chicory - Function annotation processor - Experimental annotation processor for host functions + Chicory - Host Module annotation processor + Experimental annotation processor for host modules com.dylibso.chicory - function-annotations + host-module-annotations com.github.javaparser diff --git a/function-processor/src/main/java/com/dylibso/chicory/function/processor/FunctionProcessor.java b/host-module/processor/src/main/java/com/dylibso/chicory/hostmodule/processor/HostModuleProcessor.java similarity index 97% rename from function-processor/src/main/java/com/dylibso/chicory/function/processor/FunctionProcessor.java rename to host-module/processor/src/main/java/com/dylibso/chicory/hostmodule/processor/HostModuleProcessor.java index 901fd1bbe..0a6fe47af 100644 --- a/function-processor/src/main/java/com/dylibso/chicory/function/processor/FunctionProcessor.java +++ b/host-module/processor/src/main/java/com/dylibso/chicory/hostmodule/processor/HostModuleProcessor.java @@ -1,4 +1,4 @@ -package com.dylibso.chicory.function.processor; +package com.dylibso.chicory.hostmodule.processor; import static com.github.javaparser.StaticJavaParser.parseType; import static com.github.javaparser.printer.configuration.DefaultPrinterConfiguration.ConfigOption.COLUMN_ALIGN_PARAMETERS; @@ -6,10 +6,10 @@ import static javax.tools.Diagnostic.Kind.ERROR; import static javax.tools.Diagnostic.Kind.NOTE; -import com.dylibso.chicory.function.annotations.Buffer; -import com.dylibso.chicory.function.annotations.CString; -import com.dylibso.chicory.function.annotations.HostModule; -import com.dylibso.chicory.function.annotations.WasmExport; +import com.dylibso.chicory.hostmodule.annotations.Buffer; +import com.dylibso.chicory.hostmodule.annotations.CString; +import com.dylibso.chicory.hostmodule.annotations.HostModule; +import com.dylibso.chicory.hostmodule.annotations.WasmExport; import com.github.javaparser.ast.ArrayCreationLevel; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.NodeList; @@ -56,7 +56,7 @@ import javax.lang.model.util.Elements; import javax.tools.Diagnostic; -public final class FunctionProcessor extends AbstractProcessor { +public final class HostModuleProcessor extends AbstractProcessor { @Override public SourceVersion getSupportedSourceVersion() { diff --git a/host-module/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/host-module/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 000000000..c335d639d --- /dev/null +++ b/host-module/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -0,0 +1 @@ +com.dylibso.chicory.hostmodule.processor.HostModuleProcessor diff --git a/function-processor/src/test/java/com/dylibso/chicory/function/processor/FunctionProcessorTest.java b/host-module/processor/src/test/java/com/dylibso/chicory/hostmodule/processor/HostModuleProcessorTest.java similarity index 89% rename from function-processor/src/test/java/com/dylibso/chicory/function/processor/FunctionProcessorTest.java rename to host-module/processor/src/test/java/com/dylibso/chicory/hostmodule/processor/HostModuleProcessorTest.java index efc4e7cb1..4af609bcc 100644 --- a/function-processor/src/test/java/com/dylibso/chicory/function/processor/FunctionProcessorTest.java +++ b/host-module/processor/src/test/java/com/dylibso/chicory/hostmodule/processor/HostModuleProcessorTest.java @@ -1,4 +1,4 @@ -package com.dylibso.chicory.function.processor; +package com.dylibso.chicory.hostmodule.processor; import static com.google.testing.compile.CompilationSubject.assertThat; import static com.google.testing.compile.Compiler.javac; @@ -7,12 +7,12 @@ import com.google.testing.compile.JavaFileObjects; import org.junit.jupiter.api.Test; -class FunctionProcessorTest { +class HostModuleProcessorTest { @Test void generateModules() { Compilation compilation = - javac().withProcessors(new FunctionProcessor()) + javac().withProcessors(new HostModuleProcessor()) .compile( JavaFileObjects.forResource("BasicMath.java"), JavaFileObjects.forResource("Box.java"), @@ -41,7 +41,7 @@ void generateModules() { @Test void invalidParameterTypeUnsupported() { Compilation compilation = - javac().withProcessors(new FunctionProcessor()) + javac().withProcessors(new HostModuleProcessor()) .compile(JavaFileObjects.forResource("InvalidParameterUnsupported.java")); assertThat(compilation).failed(); @@ -55,7 +55,7 @@ void invalidParameterTypeUnsupported() { @Test void invalidParameterTypeString() { Compilation compilation = - javac().withProcessors(new FunctionProcessor()) + javac().withProcessors(new HostModuleProcessor()) .compile(JavaFileObjects.forResource("InvalidParameterString.java")); assertThat(compilation).failed(); @@ -69,7 +69,7 @@ void invalidParameterTypeString() { @Test void invalidReturnType() { Compilation compilation = - javac().withProcessors(new FunctionProcessor()) + javac().withProcessors(new HostModuleProcessor()) .compile(JavaFileObjects.forResource("InvalidReturn.java")); assertThat(compilation).failed(); diff --git a/function-processor/src/test/resources/BasicMath.java b/host-module/processor/src/test/resources/BasicMath.java similarity index 80% rename from function-processor/src/test/resources/BasicMath.java rename to host-module/processor/src/test/resources/BasicMath.java index 71cd43682..b84927eca 100644 --- a/function-processor/src/test/resources/BasicMath.java +++ b/host-module/processor/src/test/resources/BasicMath.java @@ -1,7 +1,7 @@ package chicory.testing; -import com.dylibso.chicory.function.annotations.HostModule; -import com.dylibso.chicory.function.annotations.WasmExport; +import com.dylibso.chicory.hostmodule.annotations.HostModule; +import com.dylibso.chicory.hostmodule.annotations.WasmExport; import com.dylibso.chicory.runtime.HostFunction; @HostModule("math") diff --git a/function-processor/src/test/resources/BasicMathGenerated.java b/host-module/processor/src/test/resources/BasicMathGenerated.java similarity index 96% rename from function-processor/src/test/resources/BasicMathGenerated.java rename to host-module/processor/src/test/resources/BasicMathGenerated.java index 5fb3d1c6f..4079e522b 100644 --- a/function-processor/src/test/resources/BasicMathGenerated.java +++ b/host-module/processor/src/test/resources/BasicMathGenerated.java @@ -7,7 +7,7 @@ import java.util.List; import javax.annotation.processing.Generated; -@Generated("com.dylibso.chicory.function.processor.FunctionProcessor") +@Generated("com.dylibso.chicory.hostmodule.processor.HostModuleProcessor") public final class BasicMath_ModuleFactory { private BasicMath_ModuleFactory() { diff --git a/function-processor/src/test/resources/Box.java b/host-module/processor/src/test/resources/Box.java similarity index 84% rename from function-processor/src/test/resources/Box.java rename to host-module/processor/src/test/resources/Box.java index 120fc9e82..f92aee22a 100644 --- a/function-processor/src/test/resources/Box.java +++ b/host-module/processor/src/test/resources/Box.java @@ -1,7 +1,7 @@ package chicory.testing; -import com.dylibso.chicory.function.annotations.HostModule; -import com.dylibso.chicory.function.annotations.WasmExport; +import com.dylibso.chicory.hostmodule.annotations.HostModule; +import com.dylibso.chicory.hostmodule.annotations.WasmExport; import com.dylibso.chicory.runtime.HostFunction; import com.dylibso.chicory.runtime.Memory; import com.dylibso.chicory.wasm.exceptions.ChicoryException; diff --git a/function-processor/src/test/resources/InvalidParameterString.java b/host-module/processor/src/test/resources/InvalidParameterString.java similarity index 61% rename from function-processor/src/test/resources/InvalidParameterString.java rename to host-module/processor/src/test/resources/InvalidParameterString.java index e48b9ecaf..bb9e1793d 100644 --- a/function-processor/src/test/resources/InvalidParameterString.java +++ b/host-module/processor/src/test/resources/InvalidParameterString.java @@ -1,7 +1,7 @@ package chicory.testing; -import com.dylibso.chicory.function.annotations.HostModule; -import com.dylibso.chicory.function.annotations.WasmExport; +import com.dylibso.chicory.hostmodule.annotations.HostModule; +import com.dylibso.chicory.hostmodule.annotations.WasmExport; @HostModule("bad_param") public final class InvalidParameterString { diff --git a/function-processor/src/test/resources/InvalidParameterUnsupported.java b/host-module/processor/src/test/resources/InvalidParameterUnsupported.java similarity index 63% rename from function-processor/src/test/resources/InvalidParameterUnsupported.java rename to host-module/processor/src/test/resources/InvalidParameterUnsupported.java index 2641cc8f4..69222d91e 100644 --- a/function-processor/src/test/resources/InvalidParameterUnsupported.java +++ b/host-module/processor/src/test/resources/InvalidParameterUnsupported.java @@ -1,7 +1,7 @@ package chicory.testing; -import com.dylibso.chicory.function.annotations.HostModule; -import com.dylibso.chicory.function.annotations.WasmExport; +import com.dylibso.chicory.hostmodule.annotations.HostModule; +import com.dylibso.chicory.hostmodule.annotations.WasmExport; import java.math.BigDecimal; @HostModule("bad_param") diff --git a/function-processor/src/test/resources/InvalidReturn.java b/host-module/processor/src/test/resources/InvalidReturn.java similarity index 59% rename from function-processor/src/test/resources/InvalidReturn.java rename to host-module/processor/src/test/resources/InvalidReturn.java index 539c5b936..e6f2e9d95 100644 --- a/function-processor/src/test/resources/InvalidReturn.java +++ b/host-module/processor/src/test/resources/InvalidReturn.java @@ -1,7 +1,7 @@ package chicory.testing; -import com.dylibso.chicory.function.annotations.HostModule; -import com.dylibso.chicory.function.annotations.WasmExport; +import com.dylibso.chicory.hostmodule.annotations.HostModule; +import com.dylibso.chicory.hostmodule.annotations.WasmExport; @HostModule("bad_return") public final class InvalidReturn { diff --git a/function-processor/src/test/resources/NestedGenerated.java b/host-module/processor/src/test/resources/NestedGenerated.java similarity index 94% rename from function-processor/src/test/resources/NestedGenerated.java rename to host-module/processor/src/test/resources/NestedGenerated.java index f996b3da9..40cc4a04f 100644 --- a/function-processor/src/test/resources/NestedGenerated.java +++ b/host-module/processor/src/test/resources/NestedGenerated.java @@ -8,7 +8,7 @@ import java.util.List; import javax.annotation.processing.Generated; -@Generated("com.dylibso.chicory.function.processor.FunctionProcessor") +@Generated("com.dylibso.chicory.hostmodule.processor.HostModuleProcessor") public final class Nested_ModuleFactory { private Nested_ModuleFactory() { diff --git a/function-processor/src/test/resources/NoPackage.java b/host-module/processor/src/test/resources/NoPackage.java similarity index 81% rename from function-processor/src/test/resources/NoPackage.java rename to host-module/processor/src/test/resources/NoPackage.java index e35a5394d..3b1b7450a 100644 --- a/function-processor/src/test/resources/NoPackage.java +++ b/host-module/processor/src/test/resources/NoPackage.java @@ -1,5 +1,5 @@ -import com.dylibso.chicory.function.annotations.HostModule; -import com.dylibso.chicory.function.annotations.WasmExport; +import com.dylibso.chicory.hostmodule.annotations.HostModule; +import com.dylibso.chicory.hostmodule.annotations.WasmExport; import com.dylibso.chicory.runtime.HostFunction; import com.dylibso.chicory.runtime.Memory; import com.dylibso.chicory.wasm.exceptions.ChicoryException; diff --git a/function-processor/src/test/resources/NoPackageGenerated.java b/host-module/processor/src/test/resources/NoPackageGenerated.java similarity index 94% rename from function-processor/src/test/resources/NoPackageGenerated.java rename to host-module/processor/src/test/resources/NoPackageGenerated.java index d76fe5e15..0958f1c01 100644 --- a/function-processor/src/test/resources/NoPackageGenerated.java +++ b/host-module/processor/src/test/resources/NoPackageGenerated.java @@ -5,7 +5,7 @@ import java.util.List; import javax.annotation.processing.Generated; -@Generated("com.dylibso.chicory.function.processor.FunctionProcessor") +@Generated("com.dylibso.chicory.hostmodule.processor.HostModuleProcessor") public final class NoPackage_ModuleFactory { private NoPackage_ModuleFactory() { diff --git a/function-processor/src/test/resources/Simple.java b/host-module/processor/src/test/resources/Simple.java similarity index 80% rename from function-processor/src/test/resources/Simple.java rename to host-module/processor/src/test/resources/Simple.java index 48d4f6eb8..47ce7e31c 100644 --- a/function-processor/src/test/resources/Simple.java +++ b/host-module/processor/src/test/resources/Simple.java @@ -2,10 +2,10 @@ import static java.util.Objects.requireNonNull; -import com.dylibso.chicory.function.annotations.Buffer; -import com.dylibso.chicory.function.annotations.CString; -import com.dylibso.chicory.function.annotations.HostModule; -import com.dylibso.chicory.function.annotations.WasmExport; +import com.dylibso.chicory.hostmodule.annotations.Buffer; +import com.dylibso.chicory.hostmodule.annotations.CString; +import com.dylibso.chicory.hostmodule.annotations.HostModule; +import com.dylibso.chicory.hostmodule.annotations.WasmExport; import com.dylibso.chicory.runtime.HostFunction; import com.dylibso.chicory.runtime.Memory; import com.dylibso.chicory.wasm.exceptions.ChicoryException; diff --git a/function-processor/src/test/resources/SimpleGenerated.java b/host-module/processor/src/test/resources/SimpleGenerated.java similarity index 96% rename from function-processor/src/test/resources/SimpleGenerated.java rename to host-module/processor/src/test/resources/SimpleGenerated.java index 1321fe90c..867c3d10a 100644 --- a/function-processor/src/test/resources/SimpleGenerated.java +++ b/host-module/processor/src/test/resources/SimpleGenerated.java @@ -7,7 +7,7 @@ import java.util.List; import javax.annotation.processing.Generated; -@Generated("com.dylibso.chicory.function.processor.FunctionProcessor") +@Generated("com.dylibso.chicory.hostmodule.processor.HostModuleProcessor") public final class Simple_ModuleFactory { private Simple_ModuleFactory() { diff --git a/pom.xml b/pom.xml index 2282d1d6f..8739f95fa 100644 --- a/pom.xml +++ b/pom.xml @@ -40,9 +40,8 @@ bom cli docs-lib - function-annotations - function-processor fuzz + host-module jmh log machine-tests @@ -117,6 +116,7 @@ 3.20.0 3.3.1 3.5.1 + 3.8.0 1.7.0 2.43.0 3.0.0 @@ -147,12 +147,12 @@ com.dylibso.chicory - function-annotations + host-module-annotations ${project.version} com.dylibso.chicory - function-processor + host-module-processor ${project.version} @@ -186,6 +186,25 @@ ${project.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + + + com.github.javaparser + javaparser-core + ${javaparser.version} + + com.google.errorprone @@ -221,6 +240,13 @@ ${picocli.version} + + + net.lingala.zip4j + zip4j + ${zip4j.version} + + org.apache.commons diff --git a/test-gen-plugin/pom.xml b/test-gen-plugin/pom.xml index 646413ba8..467415211 100644 --- a/test-gen-plugin/pom.xml +++ b/test-gen-plugin/pom.xml @@ -21,22 +21,18 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.github.javaparser javaparser-core - ${javaparser.version} net.lingala.zip4j zip4j - ${zip4j.version} org.apache.maven diff --git a/wasi-test-gen-plugin/pom.xml b/wasi-test-gen-plugin/pom.xml index bf6a9390d..00fc13047 100644 --- a/wasi-test-gen-plugin/pom.xml +++ b/wasi-test-gen-plugin/pom.xml @@ -17,22 +17,18 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.github.javaparser javaparser-core - ${javaparser.version} net.lingala.zip4j zip4j - ${zip4j.version} org.apache.maven.shared diff --git a/wasi/pom.xml b/wasi/pom.xml index 1e05817e1..6e1a24f11 100644 --- a/wasi/pom.xml +++ b/wasi/pom.xml @@ -16,7 +16,7 @@ com.dylibso.chicory - function-annotations + host-module-annotations com.dylibso.chicory @@ -33,7 +33,7 @@ com.dylibso.chicory - function-processor + host-module-processor provided @@ -117,7 +117,7 @@ com.dylibso.chicory - function-processor + host-module-processor ${project.version} @@ -129,7 +129,7 @@ maven-dependency-plugin - com.dylibso.chicory:function-processor + com.dylibso.chicory:host-module-processor diff --git a/wasi/src/main/java/com/dylibso/chicory/wasi/WasiPreview1.java b/wasi/src/main/java/com/dylibso/chicory/wasi/WasiPreview1.java index 82bba876f..7cb9c2350 100644 --- a/wasi/src/main/java/com/dylibso/chicory/wasi/WasiPreview1.java +++ b/wasi/src/main/java/com/dylibso/chicory/wasi/WasiPreview1.java @@ -12,9 +12,9 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.toList; -import com.dylibso.chicory.function.annotations.Buffer; -import com.dylibso.chicory.function.annotations.HostModule; -import com.dylibso.chicory.function.annotations.WasmExport; +import com.dylibso.chicory.hostmodule.annotations.Buffer; +import com.dylibso.chicory.hostmodule.annotations.HostModule; +import com.dylibso.chicory.hostmodule.annotations.WasmExport; import com.dylibso.chicory.log.Logger; import com.dylibso.chicory.log.SystemLogger; import com.dylibso.chicory.runtime.HostFunction;