From 825743fad2200f56d6c0615fbe68bc28e60c3a89 Mon Sep 17 00:00:00 2001
From: David Guerin <fr.david4@gmail.com>
Date: Sat, 29 Feb 2020 19:44:42 +0100
Subject: [PATCH] feat(androidx): migrated to androidx

---
 android/gradle.properties                                   | 2 ++
 android/lib/build.gradle                                    | 2 +-
 .../java/com/marianhello/bgloc/react/ConfigMapperTest.java  | 6 +++---
 .../marianhello/bgloc/react/headless/HeadlessService.java   | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/android/gradle.properties b/android/gradle.properties
index 89e0d99e..915f0e66 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -16,3 +16,5 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index 3a8b36c5..32c46bcd 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -69,7 +69,7 @@ android {
     useLibrary 'android.test.mock'
 
     defaultConfig {
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         minSdkVersion project.ext.getMinSdkVersion()
         targetSdkVersion project.ext.getTargetSdkVersion()
         versionCode 1 // intentionally not updating version as we're not uploading to any java repository
diff --git a/android/lib/src/androidTest/java/com/marianhello/bgloc/react/ConfigMapperTest.java b/android/lib/src/androidTest/java/com/marianhello/bgloc/react/ConfigMapperTest.java
index 44682bce..48b1676c 100644
--- a/android/lib/src/androidTest/java/com/marianhello/bgloc/react/ConfigMapperTest.java
+++ b/android/lib/src/androidTest/java/com/marianhello/bgloc/react/ConfigMapperTest.java
@@ -1,9 +1,9 @@
 package com.marianhello.bgloc.react;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableMap;
diff --git a/android/lib/src/main/java/com/marianhello/bgloc/react/headless/HeadlessService.java b/android/lib/src/main/java/com/marianhello/bgloc/react/headless/HeadlessService.java
index 50a31b47..298f6fb9 100644
--- a/android/lib/src/main/java/com/marianhello/bgloc/react/headless/HeadlessService.java
+++ b/android/lib/src/main/java/com/marianhello/bgloc/react/headless/HeadlessService.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.HeadlessJsTaskService;
 import com.facebook.react.bridge.Arguments;