upgrade guava to latest version

liqipeng · Aug 30, 2020 · 60177b3 · 60177b3
1 parent 634d731
commit 60177b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/BootstrapConfigTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/BootstrapConfigTest.java
@@ -407,13 +407,13 @@ public static void afterClass() {
     @Test
     public void test() {
       List<EnvironmentPostProcessor> processorList =  SpringFactoriesLoader.loadFactories(EnvironmentPostProcessor.class, getClass().getClassLoader());
-
-      Boolean containsApollo = !Collections2.filter(processorList, new Predicate<EnvironmentPostProcessor>() {
-            @Override
-            public boolean apply(EnvironmentPostProcessor input) {
-                return input instanceof ApolloApplicationContextInitializer;
-            }
-        }).isEmpty();
+      boolean containsApollo = false;
+      for (EnvironmentPostProcessor postProcessor : processorList) {
+        if (postProcessor instanceof ApolloApplicationContextInitializer) {
+          containsApollo = true;
+          break;
+        }
+      }
       Assert.assertTrue(containsApollo);
     }
   }

diff --git a/pom.xml b/pom.xml
@@ -269,7 +269,8 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>19.0</version>
+				<!-- for jdk 7 compatibility -->
+				<version>29.0-android</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.code.gson</groupId>