diff options
| author |  Liam Miller-Cushon <cushon@google.com> | 2017-09-01 06:56:07 -0700 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-09-06 10:40:51 +0200 |
| commit | 05a704f10089aedd8d0887f3d9a7cdc89ef70bc7 (patch) | |
| tree | e9fa9921392ad976a280107d44ee8c1bdfb332d6 /third_party/BUILD | |
| parent | 5eb684ff92caefc540a7efeace324416213adbf3 (diff) | |
Remove some left over bits of Java 7 support
Change-Id: Id63d774cf9f5ce0a33ffc926f4160831e78aeba2
Diffstat (limited to 'third_party/BUILD')
| -rw-r--r-- | third_party/BUILD | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/third_party/BUILD b/third_party/BUILD index 3bdae0720a..b2be51013f 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -365,22 +365,14 @@ filegroup( ], ) -# As of Guava 20.0, Guava code uses Error Prone annotations. This isn't a -# problem when compiling with java 8, but is a problem when compiling Bazel -# with java 7 (the Error Prone jars need to be on the javac classpath). So, -# until we drop support for compiling Bazel with java 7, we unfortunately need -# to ensure that the Error Prone jars are always used together with the Guava -# jars. java_import( name = "guava", jars = [ - "error_prone/error_prone_annotations-2.0.19.jar", + "error_prone/error_prone_annotations-2.1.1.jar", "jcip_annotations/jcip-annotations-1.0-1.jar", "jsr305/jsr-305.jar", - ] + select({ - "//tools/jdk:jdk7": ["guava/guava-21.0-20161101.jar"], - "//conditions:default": ["guava/guava-21.0.jar"], - }), + "guava/guava-21.0.jar", + ], ) java_import( @@ -489,10 +481,7 @@ java_import( java_import( name = "guava-testlib", - jars = select({ - "//tools/jdk:jdk7": ["guava/guava-testlib-21.0-20161101.jar"], - "//conditions:default": ["guava/guava-testlib-21.0.jar"], - }), + jars = ["guava/guava-testlib-21.0.jar"], ) java_import( |