bump j2cl to v20240603-1

treblereel · Jun 5, 2024 · 4236421 · 4236421
1 parent 1108fc9
commit 4236421
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
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
@@ -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<DependencyReplacement> 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
@@ -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<Artifact> 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
@@ -51,7 +51,9 @@ public J2cl(List<File> strippedClasspath, @Nonnull File bootstrap, File jsOutDir
                 )
                 .setEmitReadableLibraryInfo(false)
                 .setEmitReadableSourceMap(false)
-                .setGenerateKytheIndexingMetadata(false);
+                .setGenerateKytheIndexingMetadata(false)
+                .setForbiddenAnnotations(ImmutableList.of());
+
     }
 
     public boolean transpile(List<SourceUtils.FileInfo> sourcesToCompile, List<SourceUtils.FileInfo> nativeSources) {

diff --git a/pom.xml b/pom.xml
@@ -87,7 +87,7 @@
     <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
 
     <!-- Builder dependencies versions -->
-    <j2cl.version>v20230718-1</j2cl.version>
+    <j2cl.version>v20240603-1</j2cl.version>
     <closure.compiler.unshaded.version>v20230411-1</closure.compiler.unshaded.version>
     <commons.codec.version>1.11</commons.codec.version>
     <commons.io.version>2.7</commons.io.version>
@@ -463,4 +463,4 @@
       </build>
     </profile>
   </profiles>
-</project>
+</project>