diff options
| author |  John Cater <jcater@google.com> | 2017-10-18 21:20:19 -0400 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-10-20 14:04:05 +0200 |
| commit | e147372b073708631f1366bb2b9086ed413cb0c3 (patch) | |
| tree | d1958a83512059614d8c6b815689b36154ae6df9 /scripts | |
| parent | bdd930a57d50827d7473c442774bb02881b4be27 (diff) | |
Fix compile.sh to not hardcode the guava version.
Change-Id: I5e946c093499dffd0a34253a5f8e47c49c6a12ec
PiperOrigin-RevId: 172686697
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap/compile.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index b47894408b..a6a411f787 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -20,13 +20,8 @@ PROTO_FILES=$(ls src/main/protobuf/*.proto src/main/java/com/google/devtools/bui LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-4.jar | grep -Fv /javac-9-dev-4023-3.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -Fv third_party/guava | grep -Fv third_party/guava | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ") GRPC_JAVA_VERSION=1.6.1 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e .*${GRPC_JAVA_VERSION}.*jar | tr "\n" " ") -# Guava jars are different for JDK 7 build and JDK 8 build, we select the good -# one based on the name (21.0-{date} for JDK7). -if [ "${JAVA_VERSION}" = "1.7" ]; then - GUAVA_JARS=third_party/guava/guava-*21.0-*.jar -else - GUAVA_JARS=third_party/guava/guava-*21.0.jar -fi +GUAVA_VERSIONE=23.1 +GUAVA_JARS=$(find third_party/guava -name '*.jar' | grep -e .*${GUAVA_VERSION}.*jar | tr "\n" " ") LIBRARY_JARS="${LIBRARY_JARS} ${GRPC_LIBRARY_JARS} ${GUAVA_JARS}" # tl;dr - error_prone_core contains a copy of an older version of guava, so we |