Skip to content

Commit 6330dc2

Browse files
axeluhlaxeluhl
committed
Merge remote-tracking branch 'origin/main' into main
2 parents 510a90c + 552c72e commit 6330dc2

626 files changed

Lines changed: 17424 additions & 9473 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/dependabot.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: weekly

‎.github/workflows/full-check.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,44 @@
1-
# Run all tests and builds all aspects of GWT using Java 8. Runs nightly (plus
2-
# or minus timzeones) on the main branch, and will also run right away on a
3-
# push to a release branch. Release zips are uploaded as part of the build,
4-
# though maven snapshots are not yet deployed.
1+
# Run all tests and builds all aspects of GWT using Java 11, 17, and 21. Runs
2+
# nightly (plus or minus timzeones) on the main branch, and will also run right
3+
# away on a push to a release branch. Release zips are uploaded as part of the
4+
# build, though maven snapshots are not yet deployed.
55
name: Full build
66
on:
7-
schedule:
8-
# This time is selected to be early in the morning in NA/SA/EU/ME. This
9-
# only runs on the default branch.
10-
- cron: '0 6 * * *'
117
push:
128
# Build on pushes to main and release branches. For forks, the -test may
139
# be helpful to run tests when preparing a merge.
1410
branches:
1511
- 'main'
1612
- 'release/*'
1713
- '*-test'
14+
workflow_dispatch:
15+
# Allow running manually
16+
pull_request:
17+
types: [ labeled, synchronize ]
18+
permissions:
19+
# allow publishing JUnit report for PRs
20+
checks: write
1821
jobs:
1922
build:
23+
if: ${{ !github.event.pull_request || contains(github.event.pull_request.labels.*.name, 'ready') }}
2024
runs-on: ubuntu-latest
2125
strategy:
2226
matrix:
23-
java-version: [ '8' ] #[ '11', '17', '21' ]
27+
java-version: [ '11' ] #[ '17', '21', '22' ]
2428
java-distribution: [ 'temurin' ] #, 'sapmachine' ]
25-
#include:
26-
# - java-version: 8
27-
# java-distribution: temurin
2829
steps:
2930
- name: Checkout GWT itself into one directory
30-
uses: actions/checkout@v2
31+
uses: actions/checkout@v5
3132
with:
3233
path: 'gwt'
3334
- name: Checkout GWT tools into a sibling directory
34-
uses: actions/checkout@v2
35+
uses: actions/checkout@v5
3536
with:
3637
repository: 'gwtproject/tools'
3738
path: 'tools'
3839
- name: Set up JDK ${{ matrix.java-version }}
39-
# GWT presently requires Java8 to build, but can run on newer Java versions
40-
uses: actions/setup-java@v4
40+
# GWT requires Java 11+ to build
41+
uses: actions/setup-java@v5
4142
with:
4243
java-version: ${{ matrix.java-version }}
4344
distribution: ${{ matrix.java-distribution }}
@@ -61,33 +62,32 @@ jobs:
6162
-Dtest.emma.htmlunit.disable=true
6263
6364
- name: Report test results
64-
uses: mikepenz/action-junit-report@v3.1.0
65+
uses: mikepenz/action-junit-report@v6.0.0
6566
if: always()
6667
with:
6768
report_paths: 'gwt/build/out/**/test/**/reports/TEST-*.xml'
6869
- name: Upload checkstyle xml for manual review in its own artifact
69-
uses: actions/upload-artifact@v4
70+
uses: actions/upload-artifact@v5
7071
if: always()
7172
with:
7273
name: checkstyle-reports-${{ matrix.java-version }}-${{ matrix.java-distribution }}
7374
path: 'gwt/build/out/**/checkstyle*.xml'
7475
- name: Upload test xml files for manual review in its own artifact
75-
uses: actions/upload-artifact@v4
76+
uses: actions/upload-artifact@v5
7677
if: always()
7778
with:
78-
name: junit-reports
7979
path: 'gwt/build/out/**/test/**/reports/TEST-*.xml'
8080

8181
- name: On success, upload the release zip
82-
uses: actions/upload-artifact@v4
82+
uses: actions/upload-artifact@v5
8383
with:
8484
name: gwt-${{ matrix.java-version }}-${{ matrix.java-distribution }}
8585
path: 'gwt/build/dist/gwt-*.zip'
8686

8787
- name: Set up sonatype credentials
8888
# Using the same java version as above, set up a settings.xml file
89-
uses: actions/setup-java@v4
90-
if: github.event_name == 'schedule' && github.repository_owner == 'gwtproject'
89+
uses: actions/setup-java@v5
90+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' && github.repository_owner == 'gwtproject' && matrix.java-version == '21' }}
9191
with:
9292
java-version: ${{ matrix.java-version }}
9393
distribution: ${{ matrix.java-distribution }}
@@ -97,15 +97,15 @@ jobs:
9797
server-password: SONATYPE_PASSWORD
9898

9999
- name: Nightly builds should be deployed as snapshots to sonatype
100-
if: github.event_name == 'schedule' && github.repository_owner == 'gwtproject'
100+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' && github.repository_owner == 'gwtproject' && matrix.java-version == '21' }}
101101
env:
102102
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
103103
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
104104
run: |
105105
set -eux
106106
# Set the version to deploy (it was also set in the build step above)
107107
export GWT_VERSION=HEAD-SNAPSHOT
108-
export GWT_MAVEN_REPO_URL=https://oss.sonatype.org/content/repositories/snapshots/
108+
export GWT_MAVEN_REPO_URL=https://central.sonatype.com/repository/maven-snapshots/
109109
export GWT_MAVEN_REPO_ID=sonatype-snapshots
110110
cd gwt
111111
# With no user input, run the push-gwtproject.sh script to deploy org.gwtproject artifacts

‎.github/workflows/quick-check.yml‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,25 @@ jobs:
77
build:
88
runs-on: ubuntu-latest
99
strategy:
10+
fail-fast: false
1011
matrix:
11-
java-version: [ '8' ] # '11', '17', '21' ]
12+
java-version: [ '11' ] # '17', '21', '22' ]
1213
java-distribution: [ 'temurin' ] #, 'sapmachine' ]
13-
#include:
14-
# - java-version: 8
15-
# java-distribution: temurin
1614
steps:
1715
- name: Checkout GWT itself into one directory
18-
uses: actions/checkout@v2
16+
uses: actions/checkout@v5
1917
with:
2018
path: 'gwt'
2119
# we need depth=2 to see which style violations overlap with the current changes
2220
fetch-depth: 2
2321
- name: Checkout GWT tools into a sibling directory
24-
uses: actions/checkout@v2
22+
uses: actions/checkout@v5
2523
with:
2624
repository: 'gwtproject/tools'
2725
path: 'tools'
2826
- name: Set up JDK ${{ matrix.java-version }}
29-
# GWT presently requires Java8 to build, but can run on newer Java versions
30-
uses: actions/setup-java@v4
27+
# GWT presently requires Java 11+ to build
28+
uses: actions/setup-java@v5
3129
with:
3230
java-version: ${{ matrix.java-version }}
3331
distribution: ${{ matrix.java-distribution }}
@@ -47,24 +45,25 @@ jobs:
4745
TZ=America/Los_Angeles \
4846
ANT_OPTS=-Dfile.encoding=UTF8 \
4947
ANT_OPTS=-Xmx2g
50-
ant clean dist doc checkstyle apicheck
48+
ant clean compile.tests dist doc checkstyle apicheck
5149
52-
- name: Create pull request comments/annotations for checkstyle, even on failure
53-
if: always() && github.event_name == 'pull_request'
50+
- name: Create pull request comments/annotations for checkstyle from the java 21 build, even on failure
51+
if: ${{ always() && github.event_name == 'pull_request' && matrix.java-version == '21' }}
5452
env:
5553
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
54+
REVIEWDOG_SKIP_DOGHOUSE: true
5655
run: |
5756
set -eux
5857
shopt -s globstar
5958
cd gwt
6059
for f in build/out/**/checkstyle*.xml ; do
6160
echo $f
62-
reviewdog -f=checkstyle -filter-mode=diff_context -reporter=github-pr-review -level=info < $f
61+
reviewdog -f=checkstyle -filter-mode=diff_context -reporter=github-pr-annotations -level=info < $f
6362
done
6463
- name: Upload checkstyle xml for manual review
65-
uses: actions/upload-artifact@v4
66-
if: always()
64+
uses: actions/upload-artifact@v5
65+
if: ${{ matrix.java-version == '21' }}
6766
with:
68-
name: checkstyle-reports-java-${{ matrix.java-version }}-${{ matrix.java-distribution }}
67+
name: checkstyle-reports-java${{ matrix.java-version }}-${{ matrix.java-distribution }}
6968
path: 'gwt/build/out/**/checkstyle*.xml'
7069
retention-days: 5

‎README.md‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![latest release](https://img.shields.io/github/v/release/gwtproject/gwt)](https://github.com/gwtproject/gwt/releases)
44
[![nightly](https://github.com/gwtproject/gwt/actions/workflows/full-check.yml/badge.svg)](https://github.com/gwtproject/gwt/actions/workflows/full-check.yml)
5-
[![gitter](https://img.shields.io/badge/gitter.im-Join%20Chat-green.svg)](https://gitter.im/gwtproject/gwt/)
5+
[![gitter](https://img.shields.io/badge/gitter.im-Join%20Chat-green.svg)](https://gitter.im/gwtproject/gwt)
66
[![irc](https://img.shields.io/badge/irc:%20chat.freenode.net-%23%23gwt-green.svg)](https://webchat.freenode.net/)
77

88
GWT is the official open source project for GWT releases 2.5 and onwards.
@@ -55,10 +55,6 @@ Therefore, this fork allows GWT developers a choice regarding server-side perfor
5555

5656
`$ ant clean dist-dev`
5757

58-
or if you don't have `python` and `g++` just run
59-
60-
`$ ant clean dist-dev`
61-
6258
Then you will get all `.jar` files in the folder `build/lib` and
6359
the redistributable file will be: `build/dist/gwt-0.0.0.zip`
6460

@@ -69,6 +65,8 @@ Therefore, this fork allows GWT developers a choice regarding server-side perfor
6965
- To compile everything including examples you have to run
7066

7167
`$ ant clean dist`
68+
69+
- To create maven artifacts (after building .jar using ant), use [following guide](./maven/README.txt).
7270

7371
### How to verify GWT code conventions:
7472

‎build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
</macrodef>
3232

3333
<property name="gwt.apicheck.config"
34-
location="tools/api-checker/config/gwt210_211userapi.conf"/>
34+
location="tools/api-checker/config/gwt212_213userapi.conf"/>
3535
<property name="gwt.apicheck.referencelibs"
36-
value="${gwt.tools}/api-checker-reference/2.10.0/gwt-dev-modified.jar:${gwt.tools}/api-checker-reference/2.10.0/gwt-user-modified.jar"/>
36+
value="${gwt.tools}/api-checker-reference/2.12.0/gwt-dev-modified.jar:${gwt.tools}/api-checker-reference/2.12.0/gwt-user-modified.jar"/>
3737

3838
<target name="buildonly"
3939
description="[action] Minimal one-platform devel build, without distro packaging">

‎build_tools/doctool/build.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
<property name="project.tail" value="build_tools/doctool" />
44
<import file="${gwt.root}/common.ant.xml" />
55

6-
<property.ensure name="java.tools.path" location="${java.home}/../lib/tools.jar" unless="build.host.ismac" message="Cannot find ${java.home}/../lib/tools.jar; please use a JDK when building doc rather than a JRE." />
7-
86
<target name="compile" description="Compiles this project">
9-
<gwt.javac>
10-
<classpath>
11-
<pathelement location="${java.tools.path}" />
12-
</classpath>
13-
</gwt.javac>
7+
<!--
8+
As guarded below in the build target, doctool can't be built on
9+
Java 8. In theory release could be set to 9, but 9 and 10 are EOL.
10+
-->
11+
<gwt.javac release="11" />
1412
</target>
1513

1614
<target name="build" depends="compile" description="Packages this project into a jar">

0 commit comments

Comments
 (0)