diff --git a/Makefile.config b/Makefile.config index b5ffe1fc0b..b341a8231b 100644 --- a/Makefile.config +++ b/Makefile.config @@ -111,7 +111,7 @@ JAVA_HOME := $(USER_JAVA_HOME) endif ANDROID_JAR := $(LIB_DIR)/java/android/android-23.jar -GUAVA_JAR := $(DEPENDENCIES_DIR)/java/guava/guava-23.0.jar +GUAVA_JAR := $(DEPENDENCIES_DIR)/java/guava/guava-24.1.1-jre.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 20a42f0e29..b8c2e73c89 100644 --- a/dependencies/java/guava/BUCK +++ b/dependencies/java/guava/BUCK @@ -1,6 +1,6 @@ prebuilt_jar( name = 'guava', - binary_jar = 'guava-23.0.jar', + binary_jar = 'guava-24.1.1-jre.jar', visibility = [ 'PUBLIC' ] diff --git a/dependencies/java/guava/guava-23.0.jar b/dependencies/java/guava/guava-23.0.jar deleted file mode 100644 index a5c70c4685..0000000000 Binary files a/dependencies/java/guava/guava-23.0.jar and /dev/null differ diff --git a/dependencies/java/guava/guava-24.1.1-jre.jar b/dependencies/java/guava/guava-24.1.1-jre.jar new file mode 100644 index 0000000000..bbf5b1dfdf Binary files /dev/null and b/dependencies/java/guava/guava-24.1.1-jre.jar differ diff --git a/infer/tests/build_systems/ant/build.xml b/infer/tests/build_systems/ant/build.xml index 5f7dcebaa9..da1a1e166a 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 6ba2c20e1d..28537a6bc9 100644 --- a/infer/tests/java.make +++ b/infer/tests/java.make @@ -10,7 +10,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 ANDROIDX_COLLECTION = $(JAVA_LIB_DIR)/androidx/collection-1.1.0.jar -GUAVA = $(DEPENDENCIES_DIR)/java/guava/guava-23.0.jar +GUAVA = $(DEPENDENCIES_DIR)/java/guava/guava-24.1.1-jre.jar INJECT = $(DEPENDENCIES_DIR)/java/jsr-330/javax.inject.jar JACKSON = $(DEPENDENCIES_DIR)/java/jackson/jackson-2.2.3.jar JSR305 = $(DEPENDENCIES_DIR)/java/jsr-305/jsr305.jar