Remove some more Android references

common/pom.xml

@@ -52,13 +52,7 @@
     <dependency>
       <groupId>com.google.firebase</groupId>
       <artifactId>firebase-admin</artifactId>
-      <version>[5.3.0,)</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.android</groupId>
-      <artifactId>android</artifactId>
-      <version>2.2.1</version>
+      <version>[6.0.0,)</version>
       <scope>provided</scope>
     </dependency>
 

common/src/main/java/com/firebase/geofire/GeoFire.java

@@ -28,18 +28,20 @@
 
 package com.firebase.geofire;
 
+import static com.firebase.geofire.util.GeoUtils.capRadius;
+
 import com.firebase.geofire.core.GeoHash;
 import com.google.firebase.database.DataSnapshot;
 import com.google.firebase.database.DatabaseError;
 import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.database.ValueEventListener;
 import com.google.firebase.database.GenericTypeIndicator;
-import java.lang.Throwable;
-import java.util.*;
+import com.google.firebase.database.ValueEventListener;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.logging.Logger;
 
-import static com.firebase.geofire.util.GeoUtils.capRadius;
-
 /**
  * A GeoFire instance is used to store geo location data in Firebase.
  */
@@ -123,14 +125,7 @@ public static GeoLocation getLocationValue(DataSnapshot dataSnapshot) {
      */
     public GeoFire(DatabaseReference databaseReference) {
         this.databaseReference = databaseReference;
-        EventRaiser eventRaiser;
-        try {
-            eventRaiser = new AndroidEventRaiser();
-        } catch (Throwable e) {
-            // We're not on Android, use the ThreadEventRaiser
-            eventRaiser = new ThreadEventRaiser();
-        }
-        this.eventRaiser = eventRaiser;
+        this.eventRaiser = new ThreadEventRaiser();
     }
 
     /**
@@ -179,7 +174,8 @@ public void onComplete(DatabaseError databaseError, DatabaseReference databaseRe
                 }
             });
         } else {
-            keyRef.setValue(updates, geoHash.getGeoHashString());
+            Object priority = geoHash.getGeoHashString();
+            keyRef.setValueAsync(updates, priority);
         }
     }
 
@@ -212,7 +208,7 @@ public void onComplete(DatabaseError databaseError, DatabaseReference databaseRe
                 }
             });
         } else {
-            keyRef.setValue(null);
+            keyRef.removeValueAsync();
         }
     }