Update dependencies from Google (#235)

Now using latest tagged j2cl, jsinterop-base, and the closure-compiler version that j2cl depends on. Fixes #234
Vertispan · Nov 5, 2023 · 44cbadf · 44cbadf
1 parent 194e1f3
commit 44cbadf
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/j2cl-maven-plugin/src/it/elemental2-project/pom.xml b/j2cl-maven-plugin/src/it/elemental2-project/pom.xml
@@ -7,7 +7,7 @@
     <version>1.0</version>
 
     <properties>
-        <elemental2.version>1.1.0</elemental2.version>
+        <elemental2.version>1.2.1</elemental2.version>
     </properties>
 
     <dependencies>

diff --git a/j2cl-tasks/src/main/java/com/vertispan/j2cl/build/provided/ClosureBundleTask.java b/j2cl-tasks/src/main/java/com/vertispan/j2cl/build/provided/ClosureBundleTask.java
@@ -241,7 +241,7 @@ public Task resolve(Project project, Config config) {
     public interface SourceSupplier {
         String get() throws IOException;
     }
-    public static class DependencyInfoAndSource extends DependencyInfo.Base {
+    public static class DependencyInfoAndSource implements DependencyInfo {
         private final DependencyInfo delegate;
         private final SourceSupplier sourceSupplier;
 
@@ -290,11 +290,6 @@ public ImmutableMap<String, String> getLoadFlags() {
             return delegate.getLoadFlags();
         }
 
-        @Override
-        public boolean isModule() {
-            return delegate.isModule();
-        }
-
         @Override
         public boolean isEs6Module() {
             return delegate.isEs6Module();
@@ -316,7 +311,7 @@ public boolean getHasNoCompileAnnotation() {
         }
     }
 
-    public static class DependencyInfoFormat extends DependencyInfo.Base {
+    public static class DependencyInfoFormat implements DependencyInfo {
         private String name;
 //        private String pathRelativeToClosureBase = name;
         private List<String> provides;

diff --git a/j2cl-tasks/src/main/java/com/vertispan/j2cl/tools/GwtIncompatiblePreprocessor.java b/j2cl-tasks/src/main/java/com/vertispan/j2cl/tools/GwtIncompatiblePreprocessor.java
@@ -29,7 +29,7 @@ public void preprocess(List<FileInfo> unprocessedFiles) {
         Problems problems = new Problems();
 
         try (OutputUtils.Output output = OutputUtils.initOutput(outputDirectory.toPath(), problems)) {
-            GwtIncompatibleStripper.preprocessFiles(unprocessedFiles, output, problems);
+            GwtIncompatibleStripper.preprocessFiles(unprocessedFiles, output, problems, "GwtIncompatible");
 
             if (problems.hasErrors()) {
                 throw new IllegalStateException(problems.getErrors().toString());

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
@@ -46,9 +46,9 @@ public boolean transpile(List<SourceUtils.FileInfo> sourcesToCompile, List<Sourc
                     .setOutput(output)
                     .setSources(sourcesToCompile)
                     .setNativeSources(nativeSources)
-                    .setKotlinCommonSources(Collections.emptyList())
                     .setKotlincOptions(ImmutableList.of())
-                    .build();
+                    .setWasmEntryPointStrings(ImmutableList.of())
+                    .build(problems);
 
             log.debug(options.toString());
 

diff --git a/pom.xml b/pom.xml
@@ -87,8 +87,8 @@
     <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
 
     <!-- Builder dependencies versions -->
-    <j2cl.version>0.11.0-9336533b6</j2cl.version>
-    <closure.compiler.unshaded.version>v20221102-1</closure.compiler.unshaded.version>
+    <j2cl.version>v20230718-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>
 
@@ -115,7 +115,7 @@
     <jetty.version>9.4.43.v20210629</jetty.version>
 
     <!-- Required core j2cl dependencies -->
-    <vertispan.jsinterop.base.version>1.0.0-1</vertispan.jsinterop.base.version>
+    <vertispan.jsinterop.base.version>1.0.1-1</vertispan.jsinterop.base.version>
 
     <!-- Configurations -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>