Merge pull request #29 from treblereel/development

elemental2 updated to 1.2.3, j2cl updated to v20241110-1
treblereel · Nov 28, 2024 · 2a9a0ca · 2a9a0ca
2 parents 78e8a9e + 7b08ca2
commit 2a9a0ca
Show file tree

Hide file tree

Showing 27 changed files with 1,155 additions and 1,291 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -14,19 +14,19 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - name: Setup Chrome
-        uses: browser-actions/setup-chrome@v1.7.1
+        uses: browser-actions/setup-chrome@v1.7.2
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Set up Java 11
+      - name: Set up Java 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
       - name: Build and test
         run: |
           mvn -B package --file pom.xml
       - name: Upload test results for review
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: test-results-${{ matrix.os }}
@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         mvn: ['3.8.6', '3.6.3']
-        java: ['11']
+        java: ['17']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -55,7 +55,7 @@ jobs:
         run: |
           mvn -B package --file pom.xml
       - name: Upload test results for review
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: test-results-mvn-v${{ matrix.mvn }}-jvm${{ matrix.java }}

diff --git a/annotations/pom.xml b/annotations/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.treblereel.j2cl.processors</groupId>
     <artifactId>parent</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
   </parent>
 
   <artifactId>annotations</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.treblereel.j2cl.processors</groupId>
         <artifactId>parent</artifactId>
-        <version>0.7</version>
+        <version>0.8</version>
     </parent>
 
     <artifactId>common</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.treblereel.j2cl.processors</groupId>
   <artifactId>parent</artifactId>
-  <version>0.7</version>
+  <version>0.8</version>
   <packaging>pom</packaging>
 
   <name>GWT3 processors parent</name>
@@ -57,18 +57,19 @@
     <maven.shade.plugin>3.2.4</maven.shade.plugin>
     <maven.license.plugin>3.0</maven.license.plugin>
 
-    <com.google.elemental2.version>1.2.1</com.google.elemental2.version>
+    <com.google.elemental2.version>1.2.3</com.google.elemental2.version>
     <com.google.jsinterop.annotations.version>2.0.0</com.google.jsinterop.annotations.version>
-    <j2cl.version>v20240622-2</j2cl.version>
-    <auto.common.version>0.11</auto.common.version>
-    <auto.service.version>1.0-rc7</auto.service.version>
-    <classgraph.version>4.8.141</classgraph.version>
+    <j2cl.version>v20241110-1</j2cl.version>
+    <ow2.asm.version>9.7.1</ow2.asm.version>
+    <auto.common.version>1.2.2</auto.common.version>
+    <auto.service.version>1.1.1</auto.service.version>
+    <classgraph.version>4.8.179</classgraph.version>
     <freemarker.version>2.3.30</freemarker.version>
-    <commons.io.version>2.8.0</commons.io.version>
-    <commons.text.version>1.2</commons.text.version>
+    <commons.io.version>2.17.0</commons.io.version>
+    <commons.text.version>1.12.0</commons.text.version>
     <maven.aether.provider.version>3.3.9</maven.aether.provider.version>
     <maven.resolver.version>1.9.20</maven.resolver.version>
-    <junit.version>4.11</junit.version>
+    <junit.version>4.13.1</junit.version>
   </properties>
 
   <modules>
@@ -98,6 +99,12 @@
         <version>${j2cl.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm</artifactId>
+        <version>${ow2.asm.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.apache.maven.resolver</groupId>
         <artifactId>maven-resolver-api</artifactId>

diff --git a/processor/pom.xml b/processor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.treblereel.j2cl.processors</groupId>
         <artifactId>parent</artifactId>
-        <version>0.7</version>
+        <version>0.8</version>
     </parent>
 
     <artifactId>processors</artifactId>
@@ -110,6 +110,18 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <fork>true</fork>
+                    <compilerArgs>
+                        <arg>--add-exports</arg>
+                        <arg>jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

diff --git a/...essor/src/main/java/org/treblereel/j2cl/processors/generator/GWT3EntryPointGenerator.java b/...essor/src/main/java/org/treblereel/j2cl/processors/generator/GWT3EntryPointGenerator.java
@@ -100,8 +100,8 @@ private ExecutableElement checkMethod(Element target) {
 
   private void generate(ExecutableElement methodInfo) {
     TypeElement clazz = (TypeElement) methodInfo.getEnclosingElement();
-    boolean isJsType = utils.createTypeDescriptor(clazz.asType()).isJsType();
-    String methodName = utils.createDeclarationMethodDescriptor(methodInfo).getMangledName();
+    boolean isJsType = utils.createTypeDescriptor(clazz).isJsType();
+    String methodName = utils.getMethodMangledName(methodInfo);
     String className = clazz.getSimpleName().toString();
     String classPkg = MoreElements.getPackage(clazz).getQualifiedName().toString();
 

diff --git a/processor/src/main/java/org/treblereel/j2cl/processors/generator/GWT3ExportGenerator.java b/processor/src/main/java/org/treblereel/j2cl/processors/generator/GWT3ExportGenerator.java
@@ -18,7 +18,6 @@
 
 import com.google.auto.common.MoreElements;
 import com.google.auto.common.MoreTypes;
-import com.google.j2cl.transpiler.ast.DeclaredTypeDescriptor;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
@@ -40,7 +39,6 @@
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
 import jsinterop.annotations.JsType;
@@ -164,18 +162,14 @@ private ExportDTO getExportDTO(TypeElement parent) {
   private MethodDTO getMethodDTO(TypeElement parent, Element m) {
     ExecutableElement method = checkMethod(m);
     String methodName = getSimpleName(method);
-    DeclaredType declaredType = MoreTypes.asDeclared(parent.asType());
-    DeclaredTypeDescriptor enclosingTypeDescriptor =
-        utils.createDeclaredTypeDescriptor(declaredType);
-    String mangleName =
-        utils.createDeclarationMethodDescriptor(method, enclosingTypeDescriptor).getMangledName();
+    String mangleName = utils.getMethodMangledName(method);
     return new MethodDTO(methodName, mangleName, m.getModifiers().contains(Modifier.STATIC));
   }
 
   private PropertyDTO getPropertyDTO(Element method) {
     VariableElement variableElement = checkProperty(method);
     String name = getSimpleName(variableElement);
-    String mangleName = utils.createFieldDescriptor(variableElement).getMangledName();
+    String mangleName = utils.getVariableMangledName(variableElement);
 
     return new PropertyDTO(name, mangleName);
   }

diff --git a/tests/commons/pom.xml b/tests/commons/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.treblereel.j2cl</groupId>
     <artifactId>common-tests</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
 
     <name>Common test cases</name>
     <description>Common test cases</description>
@@ -24,13 +24,11 @@
         <maven.surefire.plugin>3.1.0</maven.surefire.plugin>
         <maven.source.plugin>3.0.1</maven.source.plugin>
         <maven.license.plugin>3.0</maven.license.plugin>
-        <maven.j2cl.plugin>0.23.1</maven.j2cl.plugin>
-        <maven.j2cl.version>v20240622-2</maven.j2cl.version>
+        <maven.j2cl.plugin>0.23.2</maven.j2cl.plugin>
+        <maven.j2cl.version>v20241110-1</maven.j2cl.version>
         <maven.jasmine.plugin.version>3.0-beta-02</maven.jasmine.plugin.version>
 
-        <jsinterop.annotations.version>2.0.0</jsinterop.annotations.version>
-        <jsinterop.base.version>1.0.0</jsinterop.base.version>
-        <elemental2.version>1.2.1</elemental2.version>
+        <elemental2.version>1.2.3</elemental2.version>
     </properties>
 
     <dependencies>
@@ -39,17 +37,6 @@
             <artifactId>annotations</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.jsinterop</groupId>
-            <artifactId>jsinterop-annotations</artifactId>
-            <version>${jsinterop.annotations.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.jsinterop</groupId>
-            <artifactId>base</artifactId>
-            <version>${jsinterop.base.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.google.elemental2</groupId>
             <artifactId>elemental2-dom</artifactId>
@@ -85,7 +72,7 @@
         <dependency>
             <groupId>org.treblereel.j2cl.processors</groupId>
             <artifactId>common</artifactId>
-            <version>0.7</version>
+            <version>0.8</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/tests/entrypoint/jstype/pom.xml b/tests/entrypoint/jstype/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.treblereel.j2cl</groupId>
   <artifactId>entrypoint-jstype-tests</artifactId>
-  <version>0.7</version>
+  <version>0.8</version>
 
   <name>GWT3 Entry Point Tests for @JsType class</name>
   <description>Test cases for the GWT3 Entry Point for @JsType class</description>
@@ -24,14 +24,12 @@
     <maven.surefire.plugin>3.1.0</maven.surefire.plugin>
     <maven.source.plugin>3.0.1</maven.source.plugin>
     <maven.license.plugin>3.0</maven.license.plugin>
-    <maven.j2cl.plugin>0.23.1</maven.j2cl.plugin>
-    <maven.j2cl.version>v20240622-2</maven.j2cl.version>
+    <maven.j2cl.plugin>0.23.2</maven.j2cl.plugin>
+    <maven.j2cl.version>v20241110-1</maven.j2cl.version>
 
     <selenium.chrome.driver.version>4.12.1</selenium.chrome.driver.version>
     <junit.version>4.13.1</junit.version>
-    <jsinterop.annotations.version>2.0.0</jsinterop.annotations.version>
-    <jsinterop.base.version>1.0.0</jsinterop.base.version>
-    <elemental2.version>1.2.1</elemental2.version>
+    <elemental2.version>1.2.3</elemental2.version>
   </properties>
 
   <dependencies>
@@ -41,17 +39,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>jsinterop-annotations</artifactId>
-      <version>${jsinterop.annotations.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>base</artifactId>
-      <version>${jsinterop.base.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>com.google.elemental2</groupId>
       <artifactId>elemental2-dom</artifactId>

diff --git a/tests/entrypoint/pojo/pom.xml b/tests/entrypoint/pojo/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.treblereel.j2cl</groupId>
   <artifactId>entrypoint-pojo-tests</artifactId>
-  <version>0.7</version>
+  <version>0.8</version>
 
   <name>GWT3 Entry Point Tests for Pojo class</name>
   <description>Test cases for the GWT3 Entry Point for Pojo class</description>
@@ -24,14 +24,12 @@
     <maven.surefire.plugin>3.1.0</maven.surefire.plugin>
     <maven.source.plugin>3.0.1</maven.source.plugin>
     <maven.license.plugin>3.0</maven.license.plugin>
-    <maven.j2cl.plugin>0.23.1</maven.j2cl.plugin>
-    <maven.j2cl.version>v20240622-2</maven.j2cl.version>
+    <maven.j2cl.plugin>0.23.2</maven.j2cl.plugin>
+    <maven.j2cl.version>v20241110-1</maven.j2cl.version>
 
     <selenium.chrome.driver.version>4.12.1</selenium.chrome.driver.version>
     <junit.version>4.13.1</junit.version>
-    <jsinterop.annotations.version>2.0.0</jsinterop.annotations.version>
-    <jsinterop.base.version>1.0.0</jsinterop.base.version>
-    <elemental2.version>1.2.1</elemental2.version>
+    <elemental2.version>1.2.3</elemental2.version>
   </properties>
 
   <dependencies>
@@ -41,18 +39,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>jsinterop-annotations</artifactId>
-      <version>${jsinterop.annotations.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>base</artifactId>
-      <version>${jsinterop.base.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>com.google.elemental2</groupId>
       <artifactId>elemental2-dom</artifactId>

diff --git a/tests/entrypoint/pom.xml b/tests/entrypoint/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.treblereel.j2cl</groupId>
   <artifactId>entrypoint-tests</artifactId>
-  <version>0.7</version>
+  <version>0.8</version>
   <packaging>pom</packaging>
 
   <name>GWT3 Entry Point Tests</name>

diff --git a/tests/es6shim/pom.xml b/tests/es6shim/pom.xml
@@ -5,7 +5,7 @@
 
   <artifactId>es6shim-tests</artifactId>
   <groupId>org.treblereel.j2cl</groupId>
-  <version>0.7</version>
+  <version>0.8</version>
   <packaging>jar</packaging>
 
   <name>ES6SHIM Tests</name>
@@ -25,13 +25,11 @@
     <maven.surefire.plugin>3.1.0</maven.surefire.plugin>
     <maven.source.plugin>3.0.1</maven.source.plugin>
     <maven.license.plugin>3.0</maven.license.plugin>
-    <maven.j2cl.plugin>0.23.1</maven.j2cl.plugin>
-    <maven.j2cl.version>v20240622-2</maven.j2cl.version>
+    <maven.j2cl.plugin>0.23.2</maven.j2cl.plugin>
+    <maven.j2cl.version>v20241110-1</maven.j2cl.version>
     <maven.jasmine.plugin.version>3.0-beta-02</maven.jasmine.plugin.version>
 
-    <jsinterop.annotations.version>2.0.0</jsinterop.annotations.version>
-    <jsinterop.base.version>1.0.0</jsinterop.base.version>
-    <elemental2.version>1.2.1</elemental2.version>
+    <elemental2.version>1.2.3</elemental2.version>
   </properties>
 
   <dependencies>
@@ -41,18 +39,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>jsinterop-annotations</artifactId>
-      <version>${jsinterop.annotations.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>base</artifactId>
-      <version>${jsinterop.base.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>com.google.elemental2</groupId>
       <artifactId>elemental2-dom</artifactId>