From 4b4fdacce569f105c7482c999523ba84b5604d46 Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Sun, 26 Nov 2023 14:03:33 +0300 Subject: [PATCH 1/2] update to latest j2cl and gwt and migrate to javs 11 --- .github/workflows/build.yaml | 9 +++++++- .idea/.gitignore | 8 +++++++ .idea/checkstyle-idea.xml | 15 +++++++++++++ .idea/compiler.xml | 15 +++++++++++++ .idea/encodings.xml | 15 +++++++++++++ .idea/jarRepositories.xml | 40 +++++++++++++++++++++++++++++++++++ .idea/misc.xml | 12 +++++++++++ .idea/vcs.xml | 6 ++++++ gwt-editor-gwt2-tests/pom.xml | 4 ++-- gwt-editor-j2cl-tests/pom.xml | 39 ++-------------------------------- gwt-editor-processor/pom.xml | 24 ++++++++------------- gwt-editor/pom.xml | 2 +- pom.xml | 9 ++++---- 13 files changed, 137 insertions(+), 61 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/checkstyle-idea.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b5abb92..3d9a882 100644 --- 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 new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml new file mode 100644 index 0000000..8dbefe7 --- /dev/null +++ b/.idea/checkstyle-idea.xml @@ -0,0 +1,15 @@ + + + + 10.12.5 + JavaOnly + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..69bc57f --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..4360b43 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..6e5b61d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..67e1e61 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/gwt-editor-gwt2-tests/pom.xml b/gwt-editor-gwt2-tests/pom.xml index 16049a6..c923f3f 100644 --- a/gwt-editor-gwt2-tests/pom.xml +++ b/gwt-editor-gwt2-tests/pom.xml @@ -16,9 +16,9 @@ Test cases for the GWT 2 tests - 1.0.0 + 1.1.0 - 2.9.0 + 2.10.0 4.13.1 diff --git a/gwt-editor-j2cl-tests/pom.xml b/gwt-editor-j2cl-tests/pom.xml index 270bcb6..fc0b25f 100644 --- a/gwt-editor-j2cl-tests/pom.xml +++ b/gwt-editor-j2cl-tests/pom.xml @@ -16,12 +16,12 @@ https://github.com/gwtproject/gwt-editor - 0.16-SNAPSHOT + 0.22.0 https://repo.vertispan.com/j2cl/ - 0.8-SNAPSHOT + v20230718-1 @@ -65,41 +65,6 @@ com.vertispan.j2cl j2cl-maven-plugin ${maven.j2cl.plugin} - - ADVANCED - - - - j2cl-test - - test - - - - - - true - true - true - - - org.gwtproject.editor.client.DirtyEditorTest - org.gwtproject.editor.client.EditorErrorTest - org.gwtproject.editor.client.SimpleBeanEditorTest - org.gwtproject.editor.client.impl.DelegateMapTest - org.gwtproject.editor.client.adapters.ListEditorWrapperTest - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surfire.plugin} - - true - org.apache.maven.plugins diff --git a/gwt-editor-processor/pom.xml b/gwt-editor-processor/pom.xml index 99a381a..69a04eb 100644 --- a/gwt-editor-processor/pom.xml +++ b/gwt-editor-processor/pom.xml @@ -46,17 +46,16 @@ UTF-8 - 1.8 - 1.8 + 11 + 11 1.1 1.0 - 0.18 - 2.9.0 - 1.12.1 - 0.18 - 4.13.1 - 0.23 + 2.10.0 + 1.13.0 + 0.21.0 + 4.13.2 + 1.1.5 1.0 3.2.4 @@ -110,16 +109,11 @@ ${compile.testing.version} test - - org.truth0 - truth - ${org.truth.version} - test - + com.google.truth truth - ${truth.version} + ${org.truth.version} test diff --git a/gwt-editor/pom.xml b/gwt-editor/pom.xml index ca1610b..de7dd23 100644 --- a/gwt-editor/pom.xml +++ b/gwt-editor/pom.xml @@ -47,7 +47,7 @@ 2018 - 1.0.0 + 1.1.0 1.0.0-RC1 diff --git a/pom.xml b/pom.xml index d5ea77f..e939b85 100644 --- a/pom.xml +++ b/pom.xml @@ -54,10 +54,10 @@ UTF-8 - 1.8 - 1.8 + 11 + 11 - 3.8.1 + 3.11.0 3.0.0-M1 1.2.2 2.9 @@ -160,8 +160,7 @@ maven-compiler-plugin ${maven.compiler.plugin} - ${maven.compiler.source} - ${maven.compiler.target} + 11 From e799e3fe4cd7ed6be23ee8af8d2a1ba01c20b6c4 Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Sun, 26 Nov 2023 14:03:33 +0300 Subject: [PATCH 2/2] update to latest j2cl and gwt and migrate to javs 11 --- gwt-editor-processor/pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gwt-editor-processor/pom.xml b/gwt-editor-processor/pom.xml index 69a04eb..b261a22 100644 --- a/gwt-editor-processor/pom.xml +++ b/gwt-editor-processor/pom.xml @@ -129,10 +129,8 @@ org.apache.maven.plugins maven-compiler-plugin - 3.6.1 - ${maven.compiler.source} - ${maven.compiler.target} + 11 true true 128m