Skip to content

Commit 450df87

Browse files
Merge branch 'gwtproject:main' into main
2 parents f8e2401 + 89d06d6 commit 450df87

File tree

188 files changed

+4135
-3225
lines changed

Some content is hidden

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

188 files changed

+4135
-3225
lines changed

.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: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Run all tests and builds all aspects of GWT using Java 8, 11, and 17. Runs
1+
# Run all tests and builds all aspects of GWT using Java 11, 17, and 21. Runs
22
# nightly (plus or minus timzeones) on the main branch, and will also run right
33
# away on a push to a release branch. Release zips are uploaded as part of the
44
# build, though maven snapshots are not yet deployed.
@@ -20,20 +20,20 @@ jobs:
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
23-
java-version: [ '8', '11', '17' ]
23+
java-version: [ '11', '17', '21' ]
2424
steps:
2525
- name: Checkout GWT itself into one directory
26-
uses: actions/checkout@v2
26+
uses: actions/checkout@v4
2727
with:
2828
path: 'gwt'
2929
- name: Checkout GWT tools into a sibling directory
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v4
3131
with:
3232
repository: 'gwtproject/tools'
3333
path: 'tools'
3434
- name: Set up JDK ${{ matrix.java-version }}
35-
# GWT presently requires Java8 to build just the SDK and some tests, or 11 to build everything, but can run on newer Java versions
36-
uses: actions/setup-java@v3
35+
# GWT requires Java 11+ to build
36+
uses: actions/setup-java@v4
3737
with:
3838
java-version: ${{ matrix.java-version }}
3939
distribution: 'temurin'
@@ -57,33 +57,33 @@ jobs:
5757
-Dtest.emma.htmlunit.disable=true
5858
5959
- name: Report test results
60-
uses: mikepenz/action-junit-report@v3.1.0
60+
uses: mikepenz/action-junit-report@v4.2.1
6161
if: always()
6262
with:
6363
report_paths: 'gwt/build/out/**/test/**/reports/TEST-*.xml'
6464
- name: Upload checkstyle xml for manual review in its own artifact
65-
uses: actions/upload-artifact@v2
65+
uses: actions/upload-artifact@v4
6666
if: always()
6767
with:
6868
name: checkstyle-reports-java${{ matrix.java-version }}
6969
path: 'gwt/build/out/**/checkstyle*.xml'
7070
- name: Upload test xml files for manual review in its own artifact
71-
uses: actions/upload-artifact@v2
71+
uses: actions/upload-artifact@v4
7272
if: always()
7373
with:
7474
name: junit-reports-java${{ matrix.java-version }}
7575
path: 'gwt/build/out/**/test/**/reports/TEST-*.xml'
7676

7777
- name: On success, upload the release zip
78-
uses: actions/upload-artifact@v2
78+
uses: actions/upload-artifact@v4
7979
with:
8080
name: gwt-java${{ matrix.java-version }}
8181
path: 'gwt/build/dist/gwt-*.zip'
8282

8383
- name: Set up sonatype credentials
8484
# Using the same java version as above, set up a settings.xml file
85-
uses: actions/setup-java@v3
86-
if: ${{ github.event_name == 'schedule' && github.repository_owner == 'gwtproject' && matrix.java-version == '17' }}
85+
uses: actions/setup-java@v4
86+
if: ${{ github.event_name == 'schedule' && github.repository_owner == 'gwtproject' && matrix.java-version == '21' }}
8787
with:
8888
java-version: ${{ matrix.java-version }}
8989
distribution: 'temurin'
@@ -93,7 +93,7 @@ jobs:
9393
server-password: SONATYPE_PASSWORD
9494

9595
- name: Nightly builds should be deployed as snapshots to sonatype
96-
if: ${{ github.event_name == 'schedule' && github.repository_owner == 'gwtproject' && matrix.java-version == '17' }}
96+
if: ${{ github.event_name == 'schedule' && github.repository_owner == 'gwtproject' && matrix.java-version == '21' }}
9797
env:
9898
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
9999
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}

.github/workflows/quick-check.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
java-version: ['8', '11', '17']
11+
java-version: ['11', '17', '21']
1212
steps:
1313
- name: Checkout GWT itself into one directory
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v4
1515
with:
1616
path: 'gwt'
1717
# we need depth=2 to see which style violations overlap with the current changes
1818
fetch-depth: 2
1919
- name: Checkout GWT tools into a sibling directory
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121
with:
2222
repository: 'gwtproject/tools'
2323
path: 'tools'
2424
- name: Set up JDK ${{ matrix.java-version }}
25-
# GWT presently requires Java8 to build just the SDK and some tests, or 11+ to build everything, and can run on newer Java versions
26-
uses: actions/setup-java@v3
25+
# GWT presently requires Java 11+ to build
26+
uses: actions/setup-java@v4
2727
with:
2828
java-version: ${{ matrix.java-version }}
2929
distribution: 'temurin'
@@ -44,8 +44,8 @@ jobs:
4444
ANT_OPTS=-Xmx2g
4545
ant clean dist doc checkstyle apicheck
4646
47-
- name: Create pull request comments/annotations for checkstyle from the java 17 build, even on failure
48-
if: ${{ always() && github.event_name == 'pull_request' && matrix.java-version == '17' }}
47+
- name: Create pull request comments/annotations for checkstyle from the java 21 build, even on failure
48+
if: ${{ always() && github.event_name == 'pull_request' && matrix.java-version == '21' }}
4949
env:
5050
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5151
run: |
@@ -57,8 +57,8 @@ jobs:
5757
reviewdog -f=checkstyle -filter-mode=diff_context -reporter=github-pr-review -level=info < $f
5858
done
5959
- name: Upload checkstyle xml for manual review
60-
uses: actions/upload-artifact@v2
61-
if: ${{ matrix.java-version == '17' }}
60+
uses: actions/upload-artifact@v4
61+
if: ${{ matrix.java-version == '21' }}
6262
with:
6363
name: checkstyle-reports-java${{ matrix.java-version }}
6464
path: 'gwt/build/out/**/checkstyle*.xml'

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<gwt.ant dir="samples"/>
9999
</target>
100100

101-
<target name="buildtools" description="[subdir] Build (or runs ${target} if set) the build tools" unless="isJava8">
101+
<target name="buildtools" description="[subdir] Build (or runs ${target} if set) the build tools">
102102
<gwt.ant dir="build_tools"/>
103103
</target>
104104

build_tools/doctool/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<gwt.javac release="11" />
1212
</target>
1313

14-
<target name="build" depends="compile" description="Packages this project into a jar" unless="${isJava8}">
14+
<target name="build" depends="compile" description="Packages this project into a jar">
1515
<mkdir dir="${gwt.build.lib}" />
1616
<gwt.jar>
1717
<fileset dir="src" />

common.ant.xml

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@
2727
message="This build file is in an inconsistent state (${ant.file} != ${test.ant.file})."/>
2828

2929
<!-- Global Properties -->
30-
<!--
31-
Indicate if we are running in Java8, and so cannot run java9+ tests or generate Javadoc.
32-
-->
33-
<condition property="isJava8">
34-
<equals arg1="${ant.java.version}" arg2="1.8" />
35-
</condition>
3630
<property environment="env"/>
3731
<condition property="gwt.version" value="${env.GWT_VERSION}" else="0.0.0">
3832
<isset property="env.GWT_VERSION"/>
@@ -47,15 +41,13 @@
4741
<property name="gwt.build" location="${gwt.root}/build"/>
4842
<property name="gwt.build.out" location="${gwt.build}/out"/>
4943
<property name="gwt.build.lib" location="${gwt.build}/lib"/>
50-
<property name="gwt.build.jni" location="${gwt.build}/jni"/>
5144
<property name="gwt.build.staging" location="${gwt.build}/staging"/>
5245
<property name="gwt.build.dist" location="${gwt.build}/dist"/>
5346
<!-- gwt.threadsPerProcessor supercedes gwt.threadCount unless set to 0 -->
5447
<property name="gwt.threadsPerProcessor" value="1"/>
5548
<property name="gwt.threadCount" value="1"/>
5649
<property name="project.build" location="${gwt.build.out}/${project.tail}"/>
5750
<property name="project.lib" location="${gwt.build.lib}/gwt-${ant.project.name}.jar"/>
58-
<property name="project.jni" location="${gwt.build}/${project.tail}"/>
5951
<property name="javac.out" location="${project.build}/bin"/>
6052
<property name="javac.junit.out" location="${project.build}/bin-test"/>
6153
<property name="javac.emma.out" location="${project.build}/bin-emma"/>
@@ -66,11 +58,9 @@
6658
<property name="javac.nowarn" value="true"/>
6759

6860
<!-- javac and errorprone instructions from https://errorprone.info/docs/installation#ant -->
69-
<property name="errorprone.javac.jar" location="${gwt.tools.lib}/errorprone/javac-9+181-r4173-1.jar"/>
7061
<path id="errorprone.processorpath.ref">
71-
<pathelement location="${gwt.tools.lib}/errorprone/error_prone_core-2.9.0-with-dependencies.jar"/>
72-
<pathelement location="${gwt.tools.lib}/errorprone/jFormatString-3.0.0.jar"/>
73-
<pathelement location="${gwt.tools.lib}/errorprone/dataflow-errorprone-3.15.0.jar"/>
62+
<pathelement location="${gwt.tools.lib}/errorprone/error_prone_core-2.23.0-with-dependencies.jar"/>
63+
<pathelement location="${gwt.tools.lib}/errorprone/dataflow-errorprone-3.34.0-eisop1.jar"/>
7464
</path>
7565

7666
<property name="junit.out" location="${project.build}/test"/>
@@ -170,20 +160,19 @@
170160
</path>
171161
<mkdir dir="@{destdir}"/>
172162
<javac srcdir="@{srcdir}" sourcepath="@{srcdir}" destdir="@{destdir}" debug="${javac.debug}"
173-
debuglevel="${javac.debuglevel}" source="@{release}" target="@{release}" release="@{release}"
163+
debuglevel="${javac.debuglevel}" release="@{release}"
174164
nowarn="${javac.nowarn}" encoding="${javac.encoding}" includeantruntime="false"
175-
fork="true" compiler="modern" excludes="@{excludes}">
176-
<compilerarg value="-J-Xbootclasspath/p:${errorprone.javac.jar}" if:true="${isJava8}"/>
177-
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" unless:true="${isJava8}"/>
178-
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" unless:true="${isJava8}"/>
179-
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED" unless:true="${isJava8}"/>
180-
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED" unless:true="${isJava8}"/>
181-
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" unless:true="${isJava8}"/>
182-
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED" unless:true="${isJava8}"/>
183-
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" unless:true="${isJava8}"/>
184-
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" unless:true="${isJava8}"/>
185-
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" unless:true="${isJava8}"/>
186-
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED" unless:true="${isJava8}"/>
165+
fork="true" excludes="@{excludes}">
166+
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
167+
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" />
168+
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED" />
169+
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED" />
170+
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" />
171+
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED" />
172+
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" />
173+
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" />
174+
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" />
175+
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED" />
187176
<compilerarg value="-XDcompilePolicy=simple"/>
188177
<compilerarg value="-processorpath"/>
189178
<compilerarg pathref="mergedprocessorpath.ref"/>
@@ -249,7 +238,7 @@
249238
<jvmarg value="-Demma.coverage.out.merge=true"/>
250239
<jvmarg value="-Dcom.google.gwt.junit.reportPath=reports"/>
251240
<jvmarg line="@{test.jvmargs}"/>
252-
<jvmarg line="--add-opens=java.base/java.lang=ALL-UNNAMED" unless:true="${isJava8}"/>
241+
<jvmarg line="--add-opens=java.base/java.lang=ALL-UNNAMED" />
253242
<sysproperty key="gwt.args" value="@{test.args}"/>
254243
<sysproperty key="java.awt.headless" value="true"/>
255244
<classpath>
@@ -346,8 +335,8 @@
346335
<attribute name="outputdirectory" default="${project.build}"/>
347336
<element name="sourcepath" implicit="yes" optional="true"/>
348337
<sequential>
349-
<taskdef resource="checkstyletask.properties"
350-
classpath="${gwt.tools.antlib}/checkstyle-6.0-all.jar"/>
338+
<taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
339+
classpath="${gwt.tools.antlib}/checkstyle-10.13.0-all.jar"/>
351340
<mkdir dir="@{outputdirectory}"/>
352341
<checkstyle config="${gwt.root}/eclipse/settings/code-style/gwt-checkstyle.xml" maxErrors="0"
353342
failOnViolation="false" failureProperty="gwt.checkstyle.failed">
@@ -366,8 +355,8 @@
366355
<attribute name="outputdirectory" default="${project.build}"/>
367356
<element name="sourcepath" implicit="yes" optional="true"/>
368357
<sequential>
369-
<taskdef resource="checkstyletask.properties"
370-
classpath="${gwt.tools.antlib}/checkstyle-6.0-all.jar"/>
358+
<taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
359+
classpath="${gwt.tools.antlib}/checkstyle-10.13.0-all.jar"/>
371360
<mkdir dir="@{outputdirectory}"/>
372361
<checkstyle config="${gwt.root}/eclipse/settings/code-style/gwt-checkstyle-tests.xml"
373362
maxErrors="0" failOnViolation="false"

0 commit comments

Comments
 (0)