Use androidx

VERSIONS.gradle

@@ -5,17 +5,15 @@ def DEFAULT_BUILD_TOOLS_VERSION = "28.0.3"
 def DEFAULT_TARGET_SDK_VERSION = 28
 def DEFAULT_MIN_SDK_VERSION = 16
 def DEFAULT_PLAY_SERVICES_VERSION = "11+"
-def DEFAULT_SUPPORT_LIB_VERSION = "28.0.0"
 def DEFAULT_REACT_NATIVE_LIB_VERSION = "+"
 
 def MOCKITO_CORE_VERSION = "1.10.19"
 def POWERMOCK_VERSION = "1.6.2"
 def ROBOLECTRIC_VERSION = "3.0"
-def UI_AUTOMATOR_VERSION = "2.1.2"
+def UI_AUTOMATOR_VERSION = "1.2.0"
 def JUNIT_VERSION = "4.12"
 def FEST_ASSERT_CORE_VERSION = "2.0M10"
-def SUPPORT_TEST_VERSION = "1.0.2"
-def SUPPORTX_TEST_VERSION = "1.1.0"
+def ANDROIDX_TEST_VERSION = "1.2.0"
 def RESOURCE_PREFIX = "mauron85_bgloc_"
 
 ext {
@@ -60,14 +58,6 @@ ext {
         return playServicesVersion
     }
 
-    getSupportLibVersion = { ->
-        def supportLibVersion = DEFAULT_SUPPORT_LIB_VERSION
-        if (rootProject.hasProperty('supportLibVersion')) {
-            supportLibVersion = rootProject.supportLibVersion
-        }
-        return supportLibVersion
-    }
-
     getCompileSdkVersion = { ->
         def compileSdkVersion = DEFAULT_COMPILE_SDK_VERSION
         if (rootProject.hasProperty('compileSdkVersion')) {
@@ -117,19 +107,20 @@ ext {
     }
 
     androidLibs = [
-        supportAnnotations: [group: 'com.android.support', name: 'support-annotations', version: '24.0.0'],
-        supportCompat: [group: 'com.android.support', name: 'support-compat', version: getSupportLibVersion()],
-        appcompat: [group: 'com.android.support', name: 'appcompat-v7', version: getSupportLibVersion()],
+        androidxCore: [group: 'androidx.core', name: 'core', version: '1.3.0'],
+        annotations: [group: 'androidx.annotation', name: 'annotation', version: '1.1.0'],
+        appcompat: [group: 'androidx.appcompat', name: 'appcompat', version: '1.1.0'],
+        localbroadcastmanager: [group: 'androidx.localbroadcastmanager', name: 'localbroadcastmanager', version: '1.0.0'],
         playServicesLocation: [group: 'com.google.android.gms', name: 'play-services-location', version: getPlayServicesVersion()],
         testCore: [group: 'androidx.test', name: 'core', version: '1.0.0'],
-        testRunner: [group: 'androidx.test', name: 'runner', version: SUPPORTX_TEST_VERSION],
-        testRules: [group: 'androidx.test', name: 'rules', version: SUPPORTX_TEST_VERSION],
+        testRunner: [group: 'androidx.test', name: 'runner', version: ANDROIDX_TEST_VERSION],
+        testRules: [group: 'androidx.test', name: 'rules', version: ANDROIDX_TEST_VERSION],
     ]
 
     testLibs = [
-        testRunner: [group: 'com.android.support.test', name: 'runner', version: SUPPORT_TEST_VERSION],
-        testRules: [group: 'com.android.support.test', name: 'rules', version: SUPPORT_TEST_VERSION],
-        uiautomator: [group: 'com.android.support.test.uiautomator', name: 'uiautomator-v18', version: UI_AUTOMATOR_VERSION],
+        testRunner: [group: 'androidx.test', name: 'runner', version: ANDROIDX_TEST_VERSION],
+        testRules: [group: 'androidx.test', name: 'rules', version: ANDROIDX_TEST_VERSION],
+        uiautomator: [group: 'androidx.test.uiautomator', name: 'uiautomator', version: UI_AUTOMATOR_VERSION],
         junit: [group: 'junit', name: 'junit', version: JUNIT_VERSION],
         json: [group: 'org.json', name: 'json', version: '20140107'],
         powermockMockito: [group: 'org.powermock', name: 'powermock-api-mockito', version: POWERMOCK_VERSION],

build.gradle

@@ -6,7 +6,7 @@ def resourcePrefix = getResourcePrefix()
 
 // https://hackernoon.com/android-how-to-add-gradle-dependencies-using-foreach-c4cbcc070458
 def projDependencies = [
-    [configuration: "androidTestImplementation", dependency: androidLibs.supportAnnotations],
+    [configuration: "androidTestImplementation", dependency: androidLibs.annotations],
     [configuration: "androidTestImplementation", dependency: testLibs.testRunner],
     [configuration: "androidTestImplementation", dependency: testLibs.testRules],
     [configuration: "testImplementation", dependency: testLibs.testRunner],
@@ -16,10 +16,11 @@ def projDependencies = [
     [configuration: "testImplementation", dependency: testLibs.robolectric],
     [configuration: "testImplementation", dependency: testLibs.mockitoCore],
     [configuration: "implementation", dependency: androidLibs.playServicesLocation],
-    [configuration: "implementation", dependency: androidLibs.supportCompat],
+    [configuration: "implementation", dependency: androidLibs.androidxCore],
+    [configuration: "implementation", dependency: androidLibs.localbroadcastmanager],
     [configuration: "implementation", dependency: androidLibs.appcompat],
     [configuration: "implementation", dependency: libs.permissions,
-        options: { exclude group: 'com.android.support', module: 'appcompat-v7'}],
+        options: { exclude group: 'androidx.appcompat', module: 'appcompat'}],
     [configuration: "implementation", dependency: libs.logback],
     [configuration: "implementation", dependency: libs.slf4j],
     [configuration: "implementation", dependency: libs.promise],
@@ -64,7 +65,7 @@ android {
         resValue "string", resourcePrefix + "account_name", 'Locations'
         resValue "string", resourcePrefix + "account_type", accountPrefix + '.account'
         resValue "string", resourcePrefix + "content_authority", accountPrefix + '.provider'
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         minSdkVersion project.ext.getMinSdkVersion()
         versionCode 1
         versionName "1.0"

gradle.properties

@@ -1,2 +1,4 @@
 android.enableUnitTestBinaryResources=true
 android.builder.sdkDownload=true
+android.useAndroidX=true
+android.enableJetifier=true

src/androidTest/java/com/marianhello/bgloc/BackgroundGeolocationFacadeTest.java

@@ -1,7 +1,7 @@
 package com.marianhello.bgloc;
 
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.marianhello.bgloc.data.BackgroundLocation;
 import com.marianhello.bgloc.provider.TestLocationProviderFactory;

src/androidTest/java/com/marianhello/bgloc/BatchManagerTest.java

@@ -2,9 +2,9 @@
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.filters.SmallTest;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
 import android.util.JsonReader;
 import android.util.JsonToken;
 

src/androidTest/java/com/marianhello/bgloc/ContentProviderLocationDAOTest.java

@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import static android.support.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getContext;
 import static com.marianhello.bgloc.data.sqlite.SQLiteLocationContract.LocationEntry.SQL_DROP_LOCATION_TABLE;
 import static junit.framework.Assert.assertEquals;
 

src/androidTest/java/com/marianhello/bgloc/DBLogReaderTest.java

@@ -1,9 +1,9 @@
 package com.marianhello.bgloc;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.filters.SmallTest;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
 
 import com.marianhello.logging.DBLogReader;
 import com.marianhello.logging.LogEntry;

src/androidTest/java/com/marianhello/bgloc/LocationServiceProxyTest.java

@@ -6,10 +6,10 @@
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ServiceTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ServiceTestRule;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.marianhello.bgloc.provider.TestLocationProviderFactory;
 import com.marianhello.bgloc.service.LocationServiceImpl;

src/androidTest/java/com/marianhello/bgloc/LocationServiceTest.java

@@ -7,12 +7,12 @@
 import android.location.Location;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ServiceTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ServiceTestRule;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.marianhello.bgloc.data.BackgroundLocation;
 import com.marianhello.bgloc.provider.MockLocationProvider;

src/androidTest/java/com/marianhello/bgloc/SQLiteConfigurationDAOTest.java

@@ -3,9 +3,9 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.filters.SmallTest;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
 
 import com.marianhello.bgloc.Config;
 import com.marianhello.bgloc.data.HashMapLocationTemplate;
@@ -199,4 +199,4 @@ public void persistConfigurationWithComplexTemplate() throws JSONException {
         }
     }
 
-}
+}

src/androidTest/java/com/marianhello/bgloc/SQLiteLocationDAOTest.java

@@ -3,9 +3,9 @@
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.location.Location;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.filters.SmallTest;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
 
 import com.marianhello.bgloc.data.BackgroundLocation;
 import com.marianhello.bgloc.data.sqlite.SQLiteLocationDAO;

src/androidTest/java/com/marianhello/bgloc/SQLiteLocationDAOThreadTest.java

@@ -3,9 +3,9 @@
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.location.Location;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.filters.SmallTest;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
 
 import com.marianhello.bgloc.data.BackgroundLocation;
 import com.marianhello.bgloc.data.sqlite.SQLiteLocationDAO;

src/androidTest/java/com/marianhello/bgloc/SQLiteOpenHelperTest.java

@@ -5,9 +5,9 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.location.Location;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.filters.SmallTest;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
 
 import com.marianhello.bgloc.data.BackgroundLocation;
 import com.marianhello.bgloc.data.sqlite.SQLiteConfigurationContract;

src/main/java/com/marianhello/bgloc/BackgroundGeolocationFacade.java

@@ -14,8 +14,8 @@
 import android.os.Bundle;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.text.TextUtils;
 
 import com.github.jparkie.promise.Promise;

src/main/java/com/marianhello/bgloc/Config.java

@@ -12,7 +12,7 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.marianhello.bgloc.data.AbstractLocationTemplate;
 import com.marianhello.bgloc.data.LocationTemplate;

src/main/java/com/marianhello/bgloc/data/BackgroundLocation.java

@@ -7,7 +7,7 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.util.TimeUtils;
+import androidx.core.util.TimeUtils;
 
 import com.marianhello.bgloc.data.sqlite.SQLiteLocationContract;
 import com.marianhello.bgloc.data.sqlite.SQLiteLocationContract.LocationEntry;

src/main/java/com/marianhello/bgloc/data/LocationTransform.java

@@ -1,8 +1,8 @@
 package com.marianhello.bgloc.data;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.marianhello.bgloc.data.BackgroundLocation;
 
@@ -18,4 +18,4 @@ public interface LocationTransform
 
     @Nullable
     BackgroundLocation transformLocationBeforeCommit(@NonNull Context context, @NonNull BackgroundLocation location);
-}
+}

src/main/java/com/marianhello/bgloc/service/LocationServiceImpl.java

@@ -29,8 +29,8 @@
 import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
-import android.support.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.marianhello.bgloc.Config;
 import com.marianhello.bgloc.ConnectivityListener;

src/main/java/com/marianhello/bgloc/service/LocationServiceIntentBuilder.java

@@ -21,7 +21,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

src/main/java/com/marianhello/bgloc/sync/NotificationHelper.java

@@ -9,8 +9,8 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
 
 import com.marianhello.bgloc.ResourceResolver;
 import com.marianhello.logging.LoggerManager;

src/main/java/com/marianhello/bgloc/sync/SyncAdapter.java

@@ -11,8 +11,8 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.core.app.NotificationCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.marianhello.bgloc.Config;
 import com.marianhello.bgloc.HttpPostService;

src/test/java/com/marianhello/backgroundgeolocation/BackgroundLocationTest.java

@@ -1,7 +1,7 @@
 package com.marianhello.backgroundgeolocation;
 
 import android.os.Build;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.marianhello.bgloc.data.BackgroundLocation;
 
@@ -125,4 +125,4 @@ public void newerLocationShouldBeBetter() {
 
         Assert.assertFalse(netLocation.isBetterLocationThan(gpsLocation));
     }
-}
+}

src/test/java/com/marianhello/backgroundgeolocation/ConfigTest.java

@@ -1,6 +1,6 @@
 package com.marianhello.backgroundgeolocation;
 
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.marianhello.bgloc.Config;
 import com.marianhello.bgloc.data.ArrayListLocationTemplate;

src/test/java/com/marianhello/backgroundgeolocation/DBLogReaderTest.java

@@ -1,6 +1,6 @@
 package com.marianhello.backgroundgeolocation;
 
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.marianhello.logging.DBLogReader;