diff --git a/android/build.gradle b/android/build.gradle index 6c9ff14fa..91f703e97 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -45,7 +45,6 @@ android { compileOnly deps.lithoAnnotations implementation project(':fbjni') implementation deps.soloader - implementation deps.guava implementation deps.jsr305 implementation deps.supportAppCompat implementation deps.stetho diff --git a/android/src/test/java/com/facebook/flipper/plugins/console/JavascriptSessionTest.java b/android/src/test/java/com/facebook/flipper/plugins/console/JavascriptSessionTest.java index b1ebbd92b..0781c971f 100644 --- a/android/src/test/java/com/facebook/flipper/plugins/console/JavascriptSessionTest.java +++ b/android/src/test/java/com/facebook/flipper/plugins/console/JavascriptSessionTest.java @@ -9,9 +9,9 @@ package com.facebook.flipper.plugins.console; import static org.junit.Assert.assertEquals; -import com.google.common.collect.ImmutableMap; import java.util.Collections; import java.util.HashMap; +import java.util.Map; import org.json.JSONObject; import org.junit.Test; import org.junit.runner.RunWith; @@ -42,12 +42,10 @@ public class JavascriptSessionTest { @Test public void testVariablesGetBoundCorrectly() throws Exception { - JavascriptSession session = - new JavascriptSession( - mContextFactory, - ImmutableMap.of( - "a", 2, - "b", 2)); + Map data = new HashMap<>(); + data.put("a", 2); + data.put("b", 2); + JavascriptSession session = new JavascriptSession(mContextFactory, data); JSONObject json = session.evaluateCommand("a+b"); assertEquals("json", json.getString("type")); assertEquals(4, json.getInt("value")); @@ -65,10 +63,9 @@ public class JavascriptSessionTest { @Test public void testJavaObjectEvaluation() throws Exception { - JavascriptSession session = - new JavascriptSession( - mContextFactory, - ImmutableMap.of("object", new HashMap())); + Map data = new HashMap<>(); + data.put("object", new HashMap()); + JavascriptSession session = new JavascriptSession(mContextFactory, data); JSONObject json = session.evaluateCommand("object"); assertEquals("javaObject", json.getString("type")); assertEquals("{}", json.getJSONObject("value").getString("toString")); @@ -76,10 +73,9 @@ public class JavascriptSessionTest { @Test public void testJavaMethodEvaluation() throws Exception { - JavascriptSession session = - new JavascriptSession( - mContextFactory, - ImmutableMap.of("object", new HashMap())); + Map data = new HashMap<>(); + data.put("object", new HashMap()); + JavascriptSession session = new JavascriptSession(mContextFactory, data); JSONObject json = session.evaluateCommand("object.get"); assertEquals("method", json.getString("type")); }