[infer] upgrade the version of Guava used for the tests

Reviewed By: sblackshear Differential Revision: D7524580 fbshipit-source-id: 935a35c
Gusymochis · Apr 7, 2018 · 4dc3e5f · 4dc3e5f
1 parent 2f1d486
commit 4dc3e5f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/Makefile.config b/Makefile.config
@@ -78,7 +78,7 @@ JAVA_HOME=$(USER_JAVA_HOME)
 endif
 
 ANDROID_JAR = $(LIB_DIR)/java/android/android-23.jar
-GUAVA_JAR = $(DEPENDENCIES_DIR)/java/guava/guava-10.0.1-fork.jar
+GUAVA_JAR = $(DEPENDENCIES_DIR)/java/guava/guava-23.0.jar
 INFER_ANNOTATIONS_JAR = $(ANNOTATIONS_DIR)/annotations.jar
 JACKSON_JAR = $(DEPENDENCIES_DIR)/java/jackson/jackson-2.2.3.jar
 JSR_305_JAR = $(DEPENDENCIES_DIR)/java/jsr-305/jsr305.jar

diff --git a/dependencies/java/guava/BUCK b/dependencies/java/guava/BUCK
@@ -1,6 +1,6 @@
 prebuilt_jar(
     name = 'guava',
-    binary_jar = 'guava-10.0.1-fork.jar',
+    binary_jar = 'guava-23.0.jar',
     visibility = [
         'PUBLIC'
     ]

diff --git a/dependencies/java/guava/guava-10.0.1-fork.jar b/dependencies/java/guava/guava-10.0.1-fork.jar
diff --git a/dependencies/java/guava/guava-23.0.jar b/dependencies/java/guava/guava-23.0.jar
diff --git a/infer/tests/build_systems/ant/build.xml b/infer/tests/build_systems/ant/build.xml
@@ -10,7 +10,7 @@
             <classpath>
               <pathelement location="../../../lib/java/android/android-23.jar"/>
               <pathelement location="../../../lib/java/android/support/v4/android-support-v4.jar"/>
-              <pathelement location="../../../../dependencies/java/guava/guava-10.0.1-fork.jar"/>
+              <pathelement location="../../../../dependencies/java/guava/guava-23.0.jar"/>
               <pathelement location="../../../../dependencies/java/jackson/jackson-2.2.3.jar"/>
               <pathelement location="../../../../dependencies/java/jsr-305/jsr305.jar"/>
               <pathelement location="../../../annotations/annotations.jar"/>

diff --git a/infer/tests/java.make b/infer/tests/java.make
@@ -12,7 +12,7 @@ include $(ROOT_DIR)/Makefile.config
 ANDROID = $(JAVA_LIB_DIR)/android/android-23.jar
 ANDROIDSUPPORT = $(DEPENDENCIES_DIR)/java/android/support/v4/android-support-v4.jar
 ANNOTATIONS = $(ANNOTATIONS_DIR)/annotations.jar
-GUAVA = $(DEPENDENCIES_DIR)/java/guava/guava-10.0.1-fork.jar
+GUAVA = $(DEPENDENCIES_DIR)/java/guava/guava-23.0.jar
 JACKSON = $(DEPENDENCIES_DIR)/java/jackson/jackson-2.2.3.jar
 JSR305 = $(DEPENDENCIES_DIR)/java/jsr-305/jsr305.jar
 INJECT = $(DEPENDENCIES_DIR)/java/jsr-330/javax.inject.jar