update to latest j2cl and gwt and migrate to javs 11

gwtproject · Nov 26, 2023 · 4b4fdac · 4b4fdac
1 parent 37921b6
commit 4b4fdac
Show file tree

Hide file tree

Showing 13 changed files with 137 additions and 61 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -23,7 +23,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Check out Git repository
+        uses: actions/checkout@v3
+
+      - name: Install Java and Maven
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: 'temurin'
 
       # TODO: cache dependencies (taking into accounts: Maven plugins, snapshots, etc.)
 

diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/gwt-editor-gwt2-tests/pom.xml b/gwt-editor-gwt2-tests/pom.xml
@@ -16,9 +16,9 @@
     <description>Test cases for the GWT 2 tests</description>
 
     <properties>
-        <maven.gwt.plugin>1.0.0</maven.gwt.plugin>
+        <maven.gwt.plugin>1.1.0</maven.gwt.plugin>
 
-        <gwt.version>2.9.0</gwt.version>
+        <gwt.version>2.10.0</gwt.version>
         <junit.version>4.13.1</junit.version>
     </properties>
 

diff --git a/gwt-editor-j2cl-tests/pom.xml b/gwt-editor-j2cl-tests/pom.xml
@@ -16,12 +16,12 @@
   <url>https://github.com/gwtproject/gwt-editor</url>
 
   <properties>
-    <maven.j2cl.plugin>0.16-SNAPSHOT</maven.j2cl.plugin>
+    <maven.j2cl.plugin>0.22.0</maven.j2cl.plugin>
 
     <!-- CI -->
     <vertispan.j2cl.repo.url>https://repo.vertispan.com/j2cl/</vertispan.j2cl.repo.url>
 
-    <j2cl.version>0.8-SNAPSHOT</j2cl.version>
+    <j2cl.version>v20230718-1</j2cl.version>
   </properties>
 
   <dependencies>
@@ -65,41 +65,6 @@
         <groupId>com.vertispan.j2cl</groupId>
         <artifactId>j2cl-maven-plugin</artifactId>
         <version>${maven.j2cl.plugin}</version>
-        <configuration>
-          <compilationLevel>ADVANCED</compilationLevel>
-        </configuration>
-        <executions>
-          <execution>
-            <id>j2cl-test</id>
-            <goals>
-              <goal>test</goal>
-            </goals>
-<!-- TODO does not work. See https://github.com/Vertispan/j2clmavenplugin/issues/14 for more informations -->
-<!--            <phase>test</phase>-->
-            <configuration>
-              <defines>
-                <gwt.enableDebugId>true</gwt.enableDebugId>
-                <gwt.cspCompatModeEnabled>true</gwt.cspCompatModeEnabled>
-                <gwt.strictCspTestingEnabled>true</gwt.strictCspTestingEnabled>
-              </defines>
-              <tests>
-                <test>org.gwtproject.editor.client.DirtyEditorTest</test>
-                <test>org.gwtproject.editor.client.EditorErrorTest</test>
-                <test>org.gwtproject.editor.client.SimpleBeanEditorTest</test>
-                <test>org.gwtproject.editor.client.impl.DelegateMapTest</test>
-                <test>org.gwtproject.editor.client.adapters.ListEditorWrapperTest</test>
-              </tests>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${maven.surfire.plugin}</version>
-        <configuration>
-          <skipTests>true</skipTests>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/gwt-editor-processor/pom.xml b/gwt-editor-processor/pom.xml
@@ -46,17 +46,16 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
         <auto.common.version>1.1</auto.common.version>
         <auto.service.version>1.0</auto.service.version>
-        <compile-testing.version>0.18</compile-testing.version>
-        <gwt.version>2.9.0</gwt.version>
-        <javapoet.version>1.12.1</javapoet.version>
-        <compile.testing.version>0.18</compile.testing.version>
-        <junit.version>4.13.1</junit.version>
-        <org.truth.version>0.23</org.truth.version>
+        <gwt.version>2.10.0</gwt.version>
+        <javapoet.version>1.13.0</javapoet.version>
+        <compile.testing.version>0.21.0</compile.testing.version>
+        <junit.version>4.13.2</junit.version>
+        <org.truth.version>1.1.5</org.truth.version>
         <truth.version>1.0</truth.version>
 
         <maven.shade.plugin>3.2.4</maven.shade.plugin>
@@ -110,16 +109,11 @@
             <version>${compile.testing.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.truth0</groupId>
-            <artifactId>truth</artifactId>
-            <version>${org.truth.version}</version>
-            <scope>test</scope>
-        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.google.truth/truth -->
         <dependency>
             <groupId>com.google.truth</groupId>
             <artifactId>truth</artifactId>
-            <version>${truth.version}</version>
+            <version>${org.truth.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/gwt-editor/pom.xml b/gwt-editor/pom.xml
@@ -47,7 +47,7 @@
   <inceptionYear>2018</inceptionYear>
 
   <properties>
-    <maven.gwt.plugin>1.0.0</maven.gwt.plugin>
+    <maven.gwt.plugin>1.1.0</maven.gwt.plugin>
 
     <gwt-event.version>1.0.0-RC1</gwt-event.version>
   </properties>

diff --git a/pom.xml b/pom.xml
@@ -54,10 +54,10 @@
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
-        <maven.compiler.plugin>3.8.1</maven.compiler.plugin>
+        <maven.compiler.plugin>3.11.0</maven.compiler.plugin>
         <maven.deploy.plugin>3.0.0-M1</maven.deploy.plugin>
         <maven.flatten.plugin>1.2.2</maven.flatten.plugin>
         <maven.fmt.plugin>2.9</maven.fmt.plugin>
@@ -160,8 +160,7 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${maven.compiler.plugin}</version>
                     <configuration>
-                        <source>${maven.compiler.source}</source>
-                        <target>${maven.compiler.target}</target>
+                       <release>11</release>
                     </configuration>
                 </plugin>
             </plugins>