From 91a65903c635099378aabe7da7be0fba8ee27a27 Mon Sep 17 00:00:00 2001 From: andreatp Date: Wed, 25 Mar 2026 12:42:47 +0000 Subject: [PATCH] [chore] Improve Chicory usage DX --- java/wasm/pom.xml | 39 +------------------ .../ruby_lang/prism/wasm/WasmResource.java | 7 ---- .../java/org/ruby_lang/prism/wasm/Prism.java | 2 - 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 java/wasm/src/main/java-templates/org/ruby_lang/prism/wasm/WasmResource.java diff --git a/java/wasm/pom.xml b/java/wasm/pom.xml index d652780606..cb06a2ac8f 100644 --- a/java/wasm/pom.xml +++ b/java/wasm/pom.xml @@ -14,7 +14,7 @@ https://github.com/ruby/prism - 1.7.3 + 1.7.5 @@ -57,11 +57,6 @@ ${junit.version} test - - com.dylibso.chicory - annotations - provided - org.jruby jruby-complete @@ -72,37 +67,6 @@ - - org.codehaus.mojo - templating-maven-plugin - 3.1.0 - - - filtering-java-templates - - filter-sources - - - - - - maven-compiler-plugin - - 21 - - - com.dylibso.chicory - annotations-processor - ${chicory.version} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.5.5 - com.dylibso.chicory chicory-compiler-maven-plugin @@ -116,6 +80,7 @@ org.ruby_lang.prism.wasm.PrismParser src/test/resources/prism.wasm + org.ruby_lang.prism.wasm.Prism diff --git a/java/wasm/src/main/java-templates/org/ruby_lang/prism/wasm/WasmResource.java b/java/wasm/src/main/java-templates/org/ruby_lang/prism/wasm/WasmResource.java deleted file mode 100644 index 785c2bd916..0000000000 --- a/java/wasm/src/main/java-templates/org/ruby_lang/prism/wasm/WasmResource.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.ruby_lang.prism.wasm; - -public final class WasmResource { - public static final String absoluteFile = "file://${project.basedir}/src/test/resources/prism.wasm"; - - private WasmResource() {} -} diff --git a/java/wasm/src/main/java/org/ruby_lang/prism/wasm/Prism.java b/java/wasm/src/main/java/org/ruby_lang/prism/wasm/Prism.java index 20d6c286cb..21bace0a3c 100644 --- a/java/wasm/src/main/java/org/ruby_lang/prism/wasm/Prism.java +++ b/java/wasm/src/main/java/org/ruby_lang/prism/wasm/Prism.java @@ -1,6 +1,5 @@ package org.ruby_lang.prism.wasm; -import com.dylibso.chicory.annotations.WasmModuleInterface; import com.dylibso.chicory.runtime.ByteArrayMemory; import com.dylibso.chicory.runtime.ImportValues; import com.dylibso.chicory.runtime.Instance; @@ -11,7 +10,6 @@ import java.nio.charset.StandardCharsets; -@WasmModuleInterface(WasmResource.absoluteFile) public class Prism implements AutoCloseable { private final WasiPreview1 wasi; protected final Prism_ModuleExports exports;