From 570191741a8c0cf9fcdb279a373a28993642b8ac Mon Sep 17 00:00:00 2001 From: Artem Pianykh Date: Thu, 13 Aug 2020 02:26:26 -0700 Subject: [PATCH] [java][tests] Add kotlin-annotatins to classpath to fix warnings Summary: Absence of kotlin-annotations led to warnings messages during tests compilation: ``` $ make warning: unknown enum constant MigrationStatus.STRICT reason: class file for kotlin.annotations.jvm.MigrationStatus not found ``` This doesn't affect test results but is annoying, hence the fix. Reviewed By: mityal Differential Revision: D23051769 fbshipit-source-id: e45fbe7be --- infer/tests/java.make | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/infer/tests/java.make b/infer/tests/java.make index 2fe39a569..875507af0 100644 --- a/infer/tests/java.make +++ b/infer/tests/java.make @@ -8,13 +8,14 @@ ROOT_DIR = $(TESTS_DIR)/../.. include $(ROOT_DIR)/Makefile.config ANDROID = $(JAVA_LIB_DIR)/android/android-23.jar -ANDROIDX_COLLECTION = $(JAVA_LIB_DIR)/androidx/collection-1.1.0.jar ANDROIDSUPPORT = $(DEPENDENCIES_DIR)/java/android/support/v4/android-support-v4.jar +ANDROIDX_COLLECTION = $(JAVA_LIB_DIR)/androidx/collection-1.1.0.jar ANNOTATIONS = $(ANNOTATIONS_DIR)/annotations.jar GUAVA = $(DEPENDENCIES_DIR)/java/guava/guava-23.0.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 -INJECT = $(DEPENDENCIES_DIR)/java/jsr-330/javax.inject.jar +KOTLIN_ANNOTATIONS = $(DEPENDENCIES_DIR)/java/kotlin-annotations/kotlin-annotations-jvm-1.3.72.jar SUNTOOLS = $(DEPENDENCIES_DIR)/java/sun-tools/tools.jar -CLASSPATH=$(ANDROID):$(ANDROIDX_COLLECTION):$(ANDROIDSUPPORT):$(ANNOTATIONS):$(GUAVA):$(JACKSON):$(JSR305):$(INJECT):$(SUNTOOLS):$(JAVA_BUILTINS_DIR):$(TEST_CLASSPATH):. +CLASSPATH=$(ANDROID):$(ANDROIDX_COLLECTION):$(ANDROIDSUPPORT):$(ANNOTATIONS):$(GUAVA):$(JACKSON):$(JSR305):$(INJECT):$(KOTLIN_ANNOTATIONS):$(SUNTOOLS):$(JAVA_BUILTINS_DIR):$(TEST_CLASSPATH):.