Upgrade to chicory 1.6.1

Author: headius

java-wasm/pom.xml

@@ -15,7 +15,7 @@
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
 
-    <chicory.version>1.2.1</chicory.version>
+    <chicory.version>1.6.1</chicory.version>
     <junit.version>5.12.1</junit.version>
   </properties>
 
@@ -47,7 +47,7 @@
     </dependency>
     <dependency>
       <groupId>com.dylibso.chicory</groupId>
-      <artifactId>host-module-annotations-experimental</artifactId>
+      <artifactId>annotations</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -81,7 +81,7 @@
           <annotationProcessorPaths>
             <path>
               <groupId>com.dylibso.chicory</groupId>
-              <artifactId>host-module-processor-experimental</artifactId>
+              <artifactId>annotations-processor</artifactId>
               <version>${chicory.version}</version>
             </path>
           </annotationProcessorPaths>
@@ -112,16 +112,16 @@
       </plugin>
       <plugin>
         <groupId>com.dylibso.chicory</groupId>
-        <artifactId>aot-maven-plugin-experimental</artifactId>
+        <artifactId>chicory-compiler-maven-plugin</artifactId>
         <version>${chicory.version}</version>
         <executions>
           <execution>
             <id>prism</id>
             <goals>
-              <goal>wasm-aot-gen</goal>
+              <goal>compile</goal>
             </goals>
             <configuration>
-              <name>org.prism.Prism</name>
+              <name>org.prism.PrismParser</name>
               <wasmFile>src/main/resources/prism.wasm</wasmFile>
             </configuration>
           </execution>

java-wasm/src/main/java/org/prism/Prism.java

@@ -1,11 +1,12 @@
 package org.prism;
 
+import com.dylibso.chicory.annotations.WasmModuleInterface;
 import com.dylibso.chicory.runtime.ByteArrayMemory;
-import com.dylibso.chicory.experimental.hostmodule.annotations.WasmModuleInterface;
 import com.dylibso.chicory.runtime.ImportValues;
 import com.dylibso.chicory.runtime.Instance;
 import com.dylibso.chicory.wasi.WasiOptions;
 import com.dylibso.chicory.wasi.WasiPreview1;
+import com.dylibso.chicory.wasm.WasmModule;
 import com.dylibso.chicory.wasm.types.MemoryLimits;
 
 import java.nio.charset.StandardCharsets;
@@ -21,9 +22,11 @@ public Prism() {
     }
     public Prism(WasiOptions wasiOpts) {
         wasi = WasiPreview1.builder().withOptions(wasiOpts).build();
-        instance = Instance.builder(PrismModule.load())
+        WasmModule module = PrismParser.load();
+        PrismParser parser = new PrismParser();
+        instance = Instance.builder(module)
             .withMemoryFactory(limits -> new ByteArrayMemory(new MemoryLimits(10, MemoryLimits.MAX_PAGES)))
-            .withMachineFactory(PrismModule::create)
+            .withMachineFactory(parser.machineFactory())
             .withImportValues(ImportValues.builder().addFunction(wasi.toHostFunctions()).build())
             .build();
         exports = new Prism_ModuleExports(instance);