|
27 | 27 | message="This build file is in an inconsistent state (${ant.file} != ${test.ant.file})."/>
|
28 | 28 |
|
29 | 29 | <!-- 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> |
36 | 30 | <property environment="env"/>
|
37 | 31 | <condition property="gwt.version" value="${env.GWT_VERSION}" else="0.0.0">
|
38 | 32 | <isset property="env.GWT_VERSION"/>
|
|
47 | 41 | <property name="gwt.build" location="${gwt.root}/build"/>
|
48 | 42 | <property name="gwt.build.out" location="${gwt.build}/out"/>
|
49 | 43 | <property name="gwt.build.lib" location="${gwt.build}/lib"/>
|
50 |
| - <property name="gwt.build.jni" location="${gwt.build}/jni"/> |
51 | 44 | <property name="gwt.build.staging" location="${gwt.build}/staging"/>
|
52 | 45 | <property name="gwt.build.dist" location="${gwt.build}/dist"/>
|
53 | 46 | <!-- gwt.threadsPerProcessor supercedes gwt.threadCount unless set to 0 -->
|
54 | 47 | <property name="gwt.threadsPerProcessor" value="1"/>
|
55 | 48 | <property name="gwt.threadCount" value="1"/>
|
56 | 49 | <property name="project.build" location="${gwt.build.out}/${project.tail}"/>
|
57 | 50 | <property name="project.lib" location="${gwt.build.lib}/gwt-${ant.project.name}.jar"/>
|
58 |
| - <property name="project.jni" location="${gwt.build}/${project.tail}"/> |
59 | 51 | <property name="javac.out" location="${project.build}/bin"/>
|
60 | 52 | <property name="javac.junit.out" location="${project.build}/bin-test"/>
|
61 | 53 | <property name="javac.emma.out" location="${project.build}/bin-emma"/>
|
|
66 | 58 | <property name="javac.nowarn" value="true"/>
|
67 | 59 |
|
68 | 60 | <!-- 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"/> |
70 | 61 | <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"/> |
74 | 64 | </path>
|
75 | 65 |
|
76 | 66 | <property name="junit.out" location="${project.build}/test"/>
|
|
170 | 160 | </path>
|
171 | 161 | <mkdir dir="@{destdir}"/>
|
172 | 162 | <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}" |
174 | 164 | 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" /> |
187 | 176 | <compilerarg value="-XDcompilePolicy=simple"/>
|
188 | 177 | <compilerarg value="-processorpath"/>
|
189 | 178 | <compilerarg pathref="mergedprocessorpath.ref"/>
|
|
249 | 238 | <jvmarg value="-Demma.coverage.out.merge=true"/>
|
250 | 239 | <jvmarg value="-Dcom.google.gwt.junit.reportPath=reports"/>
|
251 | 240 | <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" /> |
253 | 242 | <sysproperty key="gwt.args" value="@{test.args}"/>
|
254 | 243 | <sysproperty key="java.awt.headless" value="true"/>
|
255 | 244 | <classpath>
|
|
346 | 335 | <attribute name="outputdirectory" default="${project.build}"/>
|
347 | 336 | <element name="sourcepath" implicit="yes" optional="true"/>
|
348 | 337 | <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"/> |
351 | 340 | <mkdir dir="@{outputdirectory}"/>
|
352 | 341 | <checkstyle config="${gwt.root}/eclipse/settings/code-style/gwt-checkstyle.xml" maxErrors="0"
|
353 | 342 | failOnViolation="false" failureProperty="gwt.checkstyle.failed">
|
|
366 | 355 | <attribute name="outputdirectory" default="${project.build}"/>
|
367 | 356 | <element name="sourcepath" implicit="yes" optional="true"/>
|
368 | 357 | <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"/> |
371 | 360 | <mkdir dir="@{outputdirectory}"/>
|
372 | 361 | <checkstyle config="${gwt.root}/eclipse/settings/code-style/gwt-checkstyle-tests.xml"
|
373 | 362 | maxErrors="0" failOnViolation="false"
|
|
0 commit comments