diff --git a/RxArcGisKit/src/main/java/com/vondear/rxarcgiskit/tool/RxArcGisMapTool.java b/RxArcGisKit/src/main/java/com/vondear/rxarcgiskit/tool/RxArcGisMapTool.java
index fb9e65db..fda91dbb 100644
--- a/RxArcGisKit/src/main/java/com/vondear/rxarcgiskit/tool/RxArcGisMapTool.java
+++ b/RxArcGisKit/src/main/java/com/vondear/rxarcgiskit/tool/RxArcGisMapTool.java
@@ -2,10 +2,11 @@
 
 import android.content.Context;
 import android.location.Location;
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import com.esri.arcgisruntime.ArcGISRuntimeEnvironment;
 import com.esri.arcgisruntime.concurrent.ListenableFuture;
 import com.esri.arcgisruntime.data.TileCache;
diff --git a/RxArcGisKit/src/main/java/com/vondear/rxarcgiskit/view/RxMapScaleView.java b/RxArcGisKit/src/main/java/com/vondear/rxarcgiskit/view/RxMapScaleView.java
index 7a65e64e..62d1bd6b 100644
--- a/RxArcGisKit/src/main/java/com/vondear/rxarcgiskit/view/RxMapScaleView.java
+++ b/RxArcGisKit/src/main/java/com/vondear/rxarcgiskit/view/RxMapScaleView.java
@@ -11,11 +11,12 @@
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.Typeface;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.esri.arcgisruntime.mapping.view.MapView;
 import com.vondear.rxarcgiskit.R;