diff --git a/j2cl-maven-plugin/src/main/java/com/vertispan/j2cl/mojo/AbstractBuildMojo.java b/j2cl-maven-plugin/src/main/java/com/vertispan/j2cl/mojo/AbstractBuildMojo.java index 2b6f751b..a546d6c9 100644 --- a/j2cl-maven-plugin/src/main/java/com/vertispan/j2cl/mojo/AbstractBuildMojo.java +++ b/j2cl-maven-plugin/src/main/java/com/vertispan/j2cl/mojo/AbstractBuildMojo.java @@ -93,6 +93,12 @@ public abstract class AbstractBuildMojo extends AbstractCacheMojo { @Parameter(defaultValue = "com.vertispan.j2cl:junit-annotations:" + Versions.J2CL_VERSION, required = true) protected String junitAnnotations; + @Parameter(defaultValue = "com.vertispan.j2cl:junit-runtime:" + Versions.J2CL_VERSION, required = true) + protected String runtime; + + @Parameter(defaultValue = "com.vertispan.j2cl:junit-runtime:zip:jszip:" + Versions.J2CL_VERSION, required = true) + protected String runtimeJsZip; + // optional, if not specified, we'll use the defaults @Parameter protected List dependencyReplacements; diff --git a/j2cl-maven-plugin/src/main/java/com/vertispan/j2cl/mojo/TestMojo.java b/j2cl-maven-plugin/src/main/java/com/vertispan/j2cl/mojo/TestMojo.java index 4130abc8..0c14d903 100644 --- a/j2cl-maven-plugin/src/main/java/com/vertispan/j2cl/mojo/TestMojo.java +++ b/j2cl-maven-plugin/src/main/java/com/vertispan/j2cl/mojo/TestMojo.java @@ -298,12 +298,14 @@ public void execute() throws MojoExecutionException, MojoFailureException { getFileWithMavenCoords(jsinteropAnnotationsJar), getFileWithMavenCoords("com.vertispan.jsinterop:base:" + Versions.VERTISPAN_JSINTEROP_BASE_VERSION),//TODO stop hardcoding this when goog releases a "base" which actually works on both platforms getFileWithMavenCoords("com.vertispan.j2cl:junit-processor:" + Versions.J2CL_VERSION), + getFileWithMavenCoords(runtime), getFileWithMavenCoords(junitAnnotations) ); List extraJsZips = Arrays.asList( getMavenArtifactWithCoords(testJsZip), getMavenArtifactWithCoords(jreJsZip), + getMavenArtifactWithCoords(runtimeJsZip), getMavenArtifactWithCoords(bootstrapJsZip) ); diff --git a/j2cl-tasks/src/main/java/com/vertispan/j2cl/tools/J2cl.java b/j2cl-tasks/src/main/java/com/vertispan/j2cl/tools/J2cl.java index 8761d6aa..b8fb0f45 100644 --- a/j2cl-tasks/src/main/java/com/vertispan/j2cl/tools/J2cl.java +++ b/j2cl-tasks/src/main/java/com/vertispan/j2cl/tools/J2cl.java @@ -51,7 +51,9 @@ public J2cl(List strippedClasspath, @Nonnull File bootstrap, File jsOutDir ) .setEmitReadableLibraryInfo(false) .setEmitReadableSourceMap(false) - .setGenerateKytheIndexingMetadata(false); + .setGenerateKytheIndexingMetadata(false) + .setForbiddenAnnotations(ImmutableList.of()); + } public boolean transpile(List sourcesToCompile, List nativeSources) { diff --git a/pom.xml b/pom.xml index 72ef4e30..abddd220 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ 1.6 - v20230718-1 + v20240603-1 v20230411-1 1.11 2.7 @@ -463,4 +463,4 @@ - \ No newline at end of file +