Merge pull request #111 from treblereel/development

Development
treblereel · Jul 9, 2024 · 82ae15d · 82ae15d
2 parents fce1c91 + c0375c2
commit 82ae15d
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 153 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.treblereel.gwt.xml.mapper</groupId>
         <artifactId>mapper-parent</artifactId>
-        <version>0.7</version>
+        <version>0.8</version>
     </parent>
 
     <artifactId>api</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.treblereel.gwt.xml.mapper</groupId>
         <artifactId>mapper-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.gwt.xml.mapper</groupId>
     <artifactId>mapper-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
     <packaging>pom</packaging>
 
     <name>mapper-parent</name>
@@ -61,14 +61,14 @@
         <nexus.staging.maven.plugin>1.6.8</nexus.staging.maven.plugin>
         <maven.scm.provider.gitexe>1.9.5</maven.scm.provider.gitexe>
 
-        <elemental2.version>1.1.0</elemental2.version>
-        <j2cl.version>0.10.0-3c97afeac</j2cl.version>
+        <elemental2.version>1.2.1</elemental2.version>
+        <j2cl.version>v20240622-2</j2cl.version>
         <javax.annotation.api.version>1.3.1</javax.annotation.api.version>
         <javaparser.core.version>3.13.1</javaparser.core.version>
         <apache.commons.lang3.version>3.9</apache.commons.lang3.version>
         <junit.version>4.13.1</junit.version>
 
-        <gwt.jakarta.version>0.2</gwt.jakarta.version>
+        <gwt.jakarta.version>0.4</gwt.jakarta.version>
         <com.fasterxml.woodstox.version>6.2.1</com.fasterxml.woodstox.version>
         <auto.common.version>0.11</auto.common.version>
         <auto.service.version>1.0-rc6</auto.service.version>

diff --git a/processor/dependency-reduced-pom.xml b/processor/dependency-reduced-pom.xml
diff --git a/processor/pom.xml b/processor/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.treblereel.gwt.xml.mapper</groupId>
     <artifactId>mapper-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
   </parent>
 
   <artifactId>processor</artifactId>

diff --git a/processor/src/main/java/org/treblereel/gwt/xml/mapper/apt/ApplicationProcessor.java b/processor/src/main/java/org/treblereel/gwt/xml/mapper/apt/ApplicationProcessor.java
@@ -44,7 +44,7 @@
 import org.treblereel.gwt.xml.mapper.apt.processor.BeanProcessor;
 
 @AutoService(Processor.class)
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_11)
 public class ApplicationProcessor extends AbstractProcessor {
 
   private final TreeLogger logger = new PrintWriterTreeLogger();

diff --git a/samples/gwt/pom.xml b/samples/gwt/pom.xml
@@ -17,9 +17,9 @@
     <!-- Convenience property to set the GWT version -->
     <gwt.version>2.10.0</gwt.version>
 
-    <!-- GWT 2.8 requires 1.8 -->
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <!-- GWT 2.8 requires 11 -->
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
@@ -51,12 +51,12 @@
     <dependency>
       <groupId>org.treblereel.gwt.xml.mapper</groupId>
       <artifactId>api</artifactId>
-      <version>0.7</version>
+      <version>0.8</version>
     </dependency>
     <dependency>
       <groupId>org.treblereel.gwt.xml.mapper</groupId>
       <artifactId>processor</artifactId>
-      <version>0.7</version>
+      <version>0.8</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -126,8 +126,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>11</source>
+          <target>11</target>
         </configuration>
       </plugin>
     </plugins>

diff --git a/samples/j2cl/pom.xml b/samples/j2cl/pom.xml
@@ -14,15 +14,14 @@
     <webappdir>${project.build.directory}/webapp</webappdir>
     <webapp.libdir>${webappdir}/WEB-INF/lib</webapp.libdir>
 
-    <j2cl.maven.plugin.version>0.20</j2cl.maven.plugin.version>
-    <elemental2.version>1.1.0</elemental2.version>
+    <elemental2.version>1.2.1</elemental2.version>
 
     <google.jsinterop.version>1.0.0</google.jsinterop.version>
-    <j2cl.version>0.10.0-3c97afeac</j2cl.version>
-    <j2cl.maven.plugin.version>0.19</j2cl.maven.plugin.version>
+    <j2cl.maven.plugin.version>0.23.1</j2cl.maven.plugin.version>
+    <j2cl.version>v20240622-2</j2cl.version>
 
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
 
     <maven.compiler.plugin.version>3.8.0</maven.compiler.plugin.version>
     <maven.tomcat7.plugin.version>2.2</maven.tomcat7.plugin.version>
@@ -36,12 +35,12 @@
     <dependency>
       <groupId>org.treblereel.gwt.xml.mapper</groupId>
       <artifactId>api</artifactId>
-      <version>0.7</version>
+      <version>0.8</version>
     </dependency>
     <dependency>
       <groupId>org.treblereel.gwt.xml.mapper</groupId>
       <artifactId>processor</artifactId>
-      <version>0.7</version>
+      <version>0.8</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -103,7 +102,7 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>com.vertispan.j2cl</groupId>
+        <groupId>org.kie.j2cl.tools</groupId>
         <artifactId>j2cl-maven-plugin</artifactId>
         <version>${j2cl.maven.plugin.version}</version>
         <executions>

diff --git a/samples/j2cl/src/main/java/org/treblereel/gwt/xml/mapper/App.native.js b/samples/j2cl/src/main/java/org/treblereel/gwt/xml/mapper/App.native.js
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,6 +27,5 @@ setTimeout(function(){
   // static imports haven't been resolved yet.
   var ep = App.$create__();
   // Invoke onModuleLoad to start the app.
-  ep.m_onModuleLoad__()
+  ep.m_onModuleLoad__void()
 }, 0);
-
diff --git a/samples/j2cl/src/main/resources/public/index.html b/samples/j2cl/src/main/resources/public/index.html
@@ -9,6 +9,6 @@
 
 </head>
 <body>
- <script language='javascript' src='j2cl-demo.js'></script>
+ <script language='javascript' src='j2cl-demo.js' defer></script>
 </body>
 </html>
diff --git a/tests/jre/pom.xml b/tests/jre/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.treblereel.gwt.xml.mapper</groupId>
     <artifactId>tests</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
   </parent>
 
   <artifactId>jre-tests</artifactId>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.treblereel.gwt.xml.mapper</groupId>
     <artifactId>mapper-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
   </parent>
 
   <artifactId>tests</artifactId>