diff --git a/Makefile.config b/Makefile.config index 32e8f5f2f..040c72e90 100644 --- 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 index db88f56a3..20a42f0e2 100644 --- 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 deleted file mode 100644 index dc94d63e8..000000000 Binary files a/dependencies/java/guava/guava-10.0.1-fork.jar and /dev/null differ diff --git a/dependencies/java/guava/guava-23.0.jar b/dependencies/java/guava/guava-23.0.jar new file mode 100644 index 000000000..a5c70c468 Binary files /dev/null and b/dependencies/java/guava/guava-23.0.jar differ diff --git a/infer/tests/build_systems/ant/build.xml b/infer/tests/build_systems/ant/build.xml index 64430e7ca..8634cad9d 100644 --- a/infer/tests/build_systems/ant/build.xml +++ b/infer/tests/build_systems/ant/build.xml @@ -10,7 +10,7 @@ - + diff --git a/infer/tests/java.make b/infer/tests/java.make index 5168ab1ae..69d16796e 100644 --- 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