Skip to content

Commit 3049051

Browse files
cushondamienmg
cushon
authored and
damienmg
committed
Update to latest javac and Error Prone
Fixes bazelbuild#2591 Change-Id: I7038b71811c54d5ece1c0993052abdffc9d0de96
1 parent 105db84 commit 3049051

15 files changed

Lines changed: 22 additions & 22 deletions

‎scripts/bootstrap/compile.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# Script for building bazel from scratch without bazel
1818

1919
PROTO_FILES=$(ls src/main/protobuf/*.proto src/main/java/com/google/devtools/build/lib/buildeventstream/proto/*.proto)
20-
LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-3.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ")
20+
LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-4.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ")
2121
GRPC_JAVA_VERSION=0.15.0
2222
GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e .*${GRPC_JAVA_VERSION}.*jar | tr "\n" " ")
2323
LIBRARY_JARS="${LIBRARY_JARS} ${GRPC_LIBRARY_JARS}"

‎src/create_embedded_tools.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ for i in $*; do
4444
*JavaBuilder*_deploy.jar) OUTPUT_PATH=tools/jdk/JavaBuilder_deploy.jar ;;
4545
*JacocoCoverage*_deploy.jar) OUTPUT_PATH=tools/jdk/JacocoCoverage_deploy.jar ;;
4646
*turbine_deploy.jar) OUTPUT_PATH=tools/jdk/turbine_deploy.jar ;;
47-
*javac-9-dev-r3297-3.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ;;
47+
*javac-9-dev-r3297-4.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar ;;
4848
*javac7.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac7.jar ;;
4949
*SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/SingleJar_deploy.jar ;;
5050
*GenClass_deploy.jar) OUTPUT_PATH=tools/jdk/GenClass_deploy.jar ;;
@@ -68,9 +68,9 @@ for i in $*; do
6868
chmod u+w "${PACKAGE_DIR}/${OUTPUT_PATH}"
6969
done
7070

71-
if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ]; then
71+
if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar ]; then
7272
cp ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac7.jar \
73-
${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar
73+
${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar
7474
fi
7575

7676
cat > "${PACKAGE_DIR}/WORKSPACE" <<EOF

‎src/test/shell/testenv.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,8 @@ function create_new_workspace() {
364364

365365
copy_tools_directory
366366

367-
[ -e third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ] \
368-
|| ln -s "${langtools_path}" third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar
367+
[ -e third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar ] \
368+
|| ln -s "${langtools_path}" third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar
369369

370370
touch WORKSPACE
371371
}

‎third_party/BUILD‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,10 @@ java_import(
310310
java_import(
311311
name = "error_prone",
312312
jars = [
313-
"error_prone/error_prone_check_api-2.0.18-20170224.jar",
314-
"error_prone/error_prone_core-2.0.18-20170224.jar",
315-
"error_prone/error_prone_annotations-2.0.18-20170224.jar",
316-
"error_prone/error_prone_annotation-2.0.18-20170224.jar",
313+
"error_prone/error_prone_check_api-2.0.18.jar",
314+
"error_prone/error_prone_core-2.0.18.jar",
315+
"error_prone/error_prone_annotations-2.0.18.jar",
316+
"error_prone/error_prone_annotation-2.0.18.jar",
317317
],
318318
exports = [
319319
":auto_common",
@@ -345,10 +345,10 @@ filegroup(
345345
name = "bootstrap_guava_and_error_prone-jars",
346346
srcs = [
347347
"auto/auto-common-0.3.jar",
348-
"error_prone/error_prone_annotation-2.0.18-20170224.jar",
349-
"error_prone/error_prone_annotations-2.0.18-20170224.jar",
350-
"error_prone/error_prone_check_api-2.0.18-20170224.jar",
351-
"error_prone/error_prone_core-2.0.18-20170224.jar",
348+
"error_prone/error_prone_annotation-2.0.18.jar",
349+
"error_prone/error_prone_annotations-2.0.18.jar",
350+
"error_prone/error_prone_check_api-2.0.18.jar",
351+
"error_prone/error_prone_core-2.0.18.jar",
352352
"guava/guava-21.0.jar",
353353
"jcip_annotations/jcip-annotations-1.0-1.jar",
354354
"jsr305/jsr-305.jar",
@@ -367,7 +367,7 @@ filegroup(
367367
java_import(
368368
name = "guava",
369369
jars = [
370-
"error_prone/error_prone_annotations-2.0.18-20170224.jar",
370+
"error_prone/error_prone_annotations-2.0.18.jar",
371371
"jcip_annotations/jcip-annotations-1.0-1.jar",
372372
"jsr305/jsr-305.jar",
373373
] + select({

‎third_party/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ a minimal set of extra dependencies.
9797

9898
## [Error Prone](https://github.com/google/error-prone)
9999

100-
* Version: 2.0.18-20170224
100+
* Version: 2.0.18
101101
* License: Apache License 2.0
102102

103103

@@ -166,7 +166,7 @@ a minimal set of extra dependencies.
166166

167167
## [javac](https://github.com/google/error-prone-javac)
168168

169-
* Version: 9-dev-r3297-3 (javac-9-dev-r3297-3.jar)
169+
* Version: 9-dev-r3297-4 (javac-9-dev-r3297-4.jar)
170170
* License: GNU GPL v2 with Classpath exception (plus other licenses, see third_party/java/jdk/langtools/LICENSE file).
171171

172172
## [jarjar](https://code.google.com/p/jarjar/)

‎third_party/error_prone/error_prone_annotation-2.0.18-20170224.jar‎

-10.3 KB
Binary file not shown.

‎third_party/error_prone/error_prone_annotation-2.0.18.jar‎

10.3 KB
Binary file not shown.

‎third_party/error_prone/error_prone_annotations-2.0.18-20170224.jar‎

-11.8 KB
Binary file not shown.

‎third_party/error_prone/error_prone_annotations-2.0.18.jar‎

11.8 KB
Binary file not shown.

third_party/error_prone/error_prone_check_api-2.0.18-20170224.jar renamed to third_party/error_prone/error_prone_check_api-2.0.18.jar

455 KB
Binary file not shown.

0 commit comments

Comments
 (0)