Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update to latest j2cl and gwt and migrate to javs 11 #27

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update to latest j2cl and gwt and migrate to javs 11 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b4fdac
update to latest j2cl and gwt and migrate to javs 11
vegegoku Nov 26, 2023
e799e3f
update to latest j2cl and gwt and migrate to javs 11
vegegoku Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Check out Git repository
uses: actions/checkout@v3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to:

  • uses: actions/checkout@v4


- name: Install Java and Maven
uses: actions/setup-java@v3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to:

  • uses: actions/setup-java@v4

with:
java-version: 11
distribution: 'temurin'

# TODO: cache dependencies (taking into accounts: Maven plugins, snapshots, etc.)

Expand Down
8 changes: 8 additions & 0 deletions .idea/.gitignore
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we really push the .idea folder?

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/checkstyle-idea.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/encodings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 40 additions & 0 deletions .idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gwt-editor-gwt2-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
39 changes: 2 additions & 37 deletions gwt-editor-j2cl-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
28 changes: 10 additions & 18 deletions gwt-editor-processor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update to 2.11.0

<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>
Expand Down Expand Up @@ -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>
Expand All @@ -135,10 +129,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<release>11</release>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use the propertiy: maven.compiler.target?

<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<meminitial>128m</meminitial>
Expand Down
2 changes: 1 addition & 1 deletion gwt-editor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 4 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down