Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.config
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dependencies/java/guava/BUCK
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
prebuilt_jar(
name = 'guava',
binary_jar = 'guava-23.0.jar',
binary_jar = 'guava-24.1.1-jre.jar',
visibility = [
'PUBLIC'
]
Expand Down
Binary file removed dependencies/java/guava/guava-23.0.jar
Binary file not shown.
Binary file added dependencies/java/guava/guava-24.1.1-jre.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion infer/tests/build_systems/ant/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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-23.0.jar"/>
<pathelement location="../../../../dependencies/java/guava/guava-24.1.1-jre.jar"/>
<pathelement location="../../../../dependencies/java/jackson/jackson-2.2.3.jar"/>
<pathelement location="../../../../dependencies/java/jsr-305/jsr305.jar"/>
<pathelement location="../../../annotations/annotations.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion infer/tests/java.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading