Skip to content

Commit 0c1d9b6

Browse files
authored
Merge pull request #4042 from andreaTP/improve-chicory-dx
[chore] Improve Chicory usage DX
2 parents ae5a82b + 91a6590 commit 0c1d9b6

3 files changed

Lines changed: 2 additions & 46 deletions

File tree

java/wasm/pom.xml

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<url>https://github.com/ruby/prism</url>
1515

1616
<properties>
17-
<chicory.version>1.7.3</chicory.version>
17+
<chicory.version>1.7.5</chicory.version>
1818
</properties>
1919

2020
<dependencyManagement>
@@ -57,11 +57,6 @@
5757
<version>${junit.version}</version>
5858
<scope>test</scope>
5959
</dependency>
60-
<dependency>
61-
<groupId>com.dylibso.chicory</groupId>
62-
<artifactId>annotations</artifactId>
63-
<scope>provided</scope>
64-
</dependency>
6560
<dependency>
6661
<groupId>org.jruby</groupId>
6762
<artifactId>jruby-complete</artifactId>
@@ -72,37 +67,6 @@
7267

7368
<build>
7469
<plugins>
75-
<plugin>
76-
<groupId>org.codehaus.mojo</groupId>
77-
<artifactId>templating-maven-plugin</artifactId>
78-
<version>3.1.0</version>
79-
<executions>
80-
<execution>
81-
<id>filtering-java-templates</id>
82-
<goals>
83-
<goal>filter-sources</goal>
84-
</goals>
85-
</execution>
86-
</executions>
87-
</plugin>
88-
<plugin>
89-
<artifactId>maven-compiler-plugin</artifactId>
90-
<configuration>
91-
<release>21</release>
92-
<annotationProcessorPaths>
93-
<path>
94-
<groupId>com.dylibso.chicory</groupId>
95-
<artifactId>annotations-processor</artifactId>
96-
<version>${chicory.version}</version>
97-
</path>
98-
</annotationProcessorPaths>
99-
</configuration>
100-
</plugin>
101-
<plugin>
102-
<groupId>org.apache.maven.plugins</groupId>
103-
<artifactId>maven-surefire-plugin</artifactId>
104-
<version>3.5.5</version>
105-
</plugin>
10670
<plugin>
10771
<groupId>com.dylibso.chicory</groupId>
10872
<artifactId>chicory-compiler-maven-plugin</artifactId>
@@ -116,6 +80,7 @@
11680
<configuration>
11781
<name>org.ruby_lang.prism.wasm.PrismParser</name>
11882
<wasmFile>src/test/resources/prism.wasm</wasmFile>
83+
<moduleInterface>org.ruby_lang.prism.wasm.Prism</moduleInterface>
11984
</configuration>
12085
</execution>
12186
</executions>

java/wasm/src/main/java-templates/org/ruby_lang/prism/wasm/WasmResource.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.ruby_lang.prism.wasm;
22

3-
import com.dylibso.chicory.annotations.WasmModuleInterface;
43
import com.dylibso.chicory.runtime.ByteArrayMemory;
54
import com.dylibso.chicory.runtime.ImportValues;
65
import com.dylibso.chicory.runtime.Instance;
@@ -11,7 +10,6 @@
1110

1211
import java.nio.charset.StandardCharsets;
1312

14-
@WasmModuleInterface(WasmResource.absoluteFile)
1513
public class Prism implements AutoCloseable {
1614
private final WasiPreview1 wasi;
1715
protected final Prism_ModuleExports exports;

0 commit comments

Comments
 (0)