From 87e58b96216b14b58bff8b2d59abc6e7231ca1d1 Mon Sep 17 00:00:00 2001 From: David Guerin Date: Sat, 29 Feb 2020 19:42:46 +0100 Subject: [PATCH 1/2] feat(androidx): moved to androidx --- VERSIONS.gradle | 10 +++++----- build.gradle | 2 +- .../bgloc/BackgroundGeolocationFacadeTest.java | 4 ++-- .../java/com/marianhello/bgloc/BatchManagerTest.java | 6 +++--- .../bgloc/ContentProviderLocationDAOTest.java | 2 +- .../java/com/marianhello/bgloc/DBLogReaderTest.java | 6 +++--- .../marianhello/bgloc/LocationServiceProxyTest.java | 11 ++++------- .../com/marianhello/bgloc/LocationServiceTest.java | 12 ++++++------ .../bgloc/SQLiteConfigurationDAOTest.java | 8 +++----- .../com/marianhello/bgloc/SQLiteLocationDAOTest.java | 6 +++--- .../bgloc/SQLiteLocationDAOThreadTest.java | 6 +++--- .../com/marianhello/bgloc/SQLiteOpenHelperTest.java | 6 +++--- .../bgloc/BackgroundGeolocationFacade.java | 4 ++-- src/main/java/com/marianhello/bgloc/Config.java | 2 +- .../marianhello/bgloc/data/BackgroundLocation.java | 3 +-- .../marianhello/bgloc/data/LocationTransform.java | 6 ++---- .../bgloc/service/LocationServiceImpl.java | 4 ++-- .../bgloc/service/LocationServiceIntentBuilder.java | 2 +- .../marianhello/bgloc/sync/NotificationHelper.java | 4 ++-- .../java/com/marianhello/bgloc/sync/SyncAdapter.java | 4 ++-- .../BackgroundLocationTest.java | 2 +- .../backgroundgeolocation/ConfigTest.java | 2 +- .../backgroundgeolocation/DBLogReaderTest.java | 2 +- .../backgroundgeolocation/PostLocationTaskTest.java | 3 ++- 24 files changed, 55 insertions(+), 62 deletions(-) diff --git a/VERSIONS.gradle b/VERSIONS.gradle index 61f08653..17a06239 100644 --- a/VERSIONS.gradle +++ b/VERSIONS.gradle @@ -21,11 +21,11 @@ def RESOURCE_PREFIX = "mauron85_bgloc_" ext { getApplicationId = { -> def applicationId = "com.marianhello.app" - if (findProject('..:app') != null) { - applicationId = project('..:app').android.defaultConfig.applicationId - } else if (findProject(':app') != null) { - applicationId = project(':app').android.defaultConfig.applicationId - } + // if (findProject('..:app') != null) { + // applicationId = project('..:app').android.defaultConfig.applicationId + // } else if (findProject(':app') != null) { + // applicationId = project(':app').android.defaultConfig.applicationId + // } if (rootProject.hasProperty('applicationId')) { applicationId = rootProject.applicationId } diff --git a/build.gradle b/build.gradle index 98542b13..07961e83 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,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" diff --git a/src/androidTest/java/com/marianhello/bgloc/BackgroundGeolocationFacadeTest.java b/src/androidTest/java/com/marianhello/bgloc/BackgroundGeolocationFacadeTest.java index 24fc246a..3de17568 100644 --- a/src/androidTest/java/com/marianhello/bgloc/BackgroundGeolocationFacadeTest.java +++ b/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.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.marianhello.bgloc.data.BackgroundLocation; import com.marianhello.bgloc.provider.TestLocationProviderFactory; diff --git a/src/androidTest/java/com/marianhello/bgloc/BatchManagerTest.java b/src/androidTest/java/com/marianhello/bgloc/BatchManagerTest.java index 33e5c69e..cd1439db 100644 --- a/src/androidTest/java/com/marianhello/bgloc/BatchManagerTest.java +++ b/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.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; import android.util.JsonReader; import android.util.JsonToken; diff --git a/src/androidTest/java/com/marianhello/bgloc/ContentProviderLocationDAOTest.java b/src/androidTest/java/com/marianhello/bgloc/ContentProviderLocationDAOTest.java index a255b876..e7aaec7a 100644 --- a/src/androidTest/java/com/marianhello/bgloc/ContentProviderLocationDAOTest.java +++ b/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.platform.app.InstrumentationRegistry.getContext; import static com.marianhello.bgloc.data.sqlite.SQLiteLocationContract.LocationEntry.SQL_DROP_LOCATION_TABLE; import static junit.framework.Assert.assertEquals; diff --git a/src/androidTest/java/com/marianhello/bgloc/DBLogReaderTest.java b/src/androidTest/java/com/marianhello/bgloc/DBLogReaderTest.java index 27c27c9a..026a5479 100644 --- a/src/androidTest/java/com/marianhello/bgloc/DBLogReaderTest.java +++ b/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.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; import com.marianhello.logging.DBLogReader; import com.marianhello.logging.LogEntry; diff --git a/src/androidTest/java/com/marianhello/bgloc/LocationServiceProxyTest.java b/src/androidTest/java/com/marianhello/bgloc/LocationServiceProxyTest.java index 01c52712..ceaad33b 100644 --- a/src/androidTest/java/com/marianhello/bgloc/LocationServiceProxyTest.java +++ b/src/androidTest/java/com/marianhello/bgloc/LocationServiceProxyTest.java @@ -6,20 +6,17 @@ 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.platform.app.InstrumentationRegistry; +import androidx.test.rule.ServiceTestRule; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.marianhello.bgloc.provider.TestLocationProviderFactory; import com.marianhello.bgloc.service.LocationServiceImpl; -import com.marianhello.bgloc.service.LocationServiceIntentBuilder; import com.marianhello.bgloc.service.LocationServiceProxy; import org.junit.After; -import org.junit.AfterClass; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; diff --git a/src/androidTest/java/com/marianhello/bgloc/LocationServiceTest.java b/src/androidTest/java/com/marianhello/bgloc/LocationServiceTest.java index 66988193..dee5233f 100644 --- a/src/androidTest/java/com/marianhello/bgloc/LocationServiceTest.java +++ b/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.platform.app.InstrumentationRegistry; +import androidx.test.rule.ServiceTestRule; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.marianhello.bgloc.data.BackgroundLocation; import com.marianhello.bgloc.provider.MockLocationProvider; diff --git a/src/androidTest/java/com/marianhello/bgloc/SQLiteConfigurationDAOTest.java b/src/androidTest/java/com/marianhello/bgloc/SQLiteConfigurationDAOTest.java index 2257931f..d5b3bb62 100644 --- a/src/androidTest/java/com/marianhello/bgloc/SQLiteConfigurationDAOTest.java +++ b/src/androidTest/java/com/marianhello/bgloc/SQLiteConfigurationDAOTest.java @@ -3,11 +3,10 @@ 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.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; -import com.marianhello.bgloc.Config; import com.marianhello.bgloc.data.HashMapLocationTemplate; import com.marianhello.bgloc.data.LocationTemplate; import com.marianhello.bgloc.data.LocationTemplateFactory; @@ -24,7 +23,6 @@ import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedHashSet; /** * Created by finch on 13/07/16. diff --git a/src/androidTest/java/com/marianhello/bgloc/SQLiteLocationDAOTest.java b/src/androidTest/java/com/marianhello/bgloc/SQLiteLocationDAOTest.java index 3c8ff111..92bb5016 100644 --- a/src/androidTest/java/com/marianhello/bgloc/SQLiteLocationDAOTest.java +++ b/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.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; import com.marianhello.bgloc.data.BackgroundLocation; import com.marianhello.bgloc.data.sqlite.SQLiteLocationDAO; diff --git a/src/androidTest/java/com/marianhello/bgloc/SQLiteLocationDAOThreadTest.java b/src/androidTest/java/com/marianhello/bgloc/SQLiteLocationDAOThreadTest.java index 32b9b7be..eccc276d 100644 --- a/src/androidTest/java/com/marianhello/bgloc/SQLiteLocationDAOThreadTest.java +++ b/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.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; import com.marianhello.bgloc.data.BackgroundLocation; import com.marianhello.bgloc.data.sqlite.SQLiteLocationDAO; diff --git a/src/androidTest/java/com/marianhello/bgloc/SQLiteOpenHelperTest.java b/src/androidTest/java/com/marianhello/bgloc/SQLiteOpenHelperTest.java index 169c6c47..d5efa03c 100644 --- a/src/androidTest/java/com/marianhello/bgloc/SQLiteOpenHelperTest.java +++ b/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.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; import com.marianhello.bgloc.data.BackgroundLocation; import com.marianhello.bgloc.data.sqlite.SQLiteConfigurationContract; diff --git a/src/main/java/com/marianhello/bgloc/BackgroundGeolocationFacade.java b/src/main/java/com/marianhello/bgloc/BackgroundGeolocationFacade.java index a8c755f7..e428e3a4 100644 --- a/src/main/java/com/marianhello/bgloc/BackgroundGeolocationFacade.java +++ b/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; diff --git a/src/main/java/com/marianhello/bgloc/Config.java b/src/main/java/com/marianhello/bgloc/Config.java index db809d0d..09a64320 100644 --- a/src/main/java/com/marianhello/bgloc/Config.java +++ b/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; diff --git a/src/main/java/com/marianhello/bgloc/data/BackgroundLocation.java b/src/main/java/com/marianhello/bgloc/data/BackgroundLocation.java index f41b12a1..9d2e7ce4 100644 --- a/src/main/java/com/marianhello/bgloc/data/BackgroundLocation.java +++ b/src/main/java/com/marianhello/bgloc/data/BackgroundLocation.java @@ -7,9 +7,8 @@ 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; import org.json.JSONException; diff --git a/src/main/java/com/marianhello/bgloc/data/LocationTransform.java b/src/main/java/com/marianhello/bgloc/data/LocationTransform.java index 3e3b65c6..41e2002e 100644 --- a/src/main/java/com/marianhello/bgloc/data/LocationTransform.java +++ b/src/main/java/com/marianhello/bgloc/data/LocationTransform.java @@ -1,10 +1,8 @@ package com.marianhello.bgloc.data; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - -import com.marianhello.bgloc.data.BackgroundLocation; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public interface LocationTransform { diff --git a/src/main/java/com/marianhello/bgloc/service/LocationServiceImpl.java b/src/main/java/com/marianhello/bgloc/service/LocationServiceImpl.java index 18f1ba18..8f40b370 100644 --- a/src/main/java/com/marianhello/bgloc/service/LocationServiceImpl.java +++ b/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; diff --git a/src/main/java/com/marianhello/bgloc/service/LocationServiceIntentBuilder.java b/src/main/java/com/marianhello/bgloc/service/LocationServiceIntentBuilder.java index fd0b99e0..3d95eba6 100644 --- a/src/main/java/com/marianhello/bgloc/service/LocationServiceIntentBuilder.java +++ b/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; diff --git a/src/main/java/com/marianhello/bgloc/sync/NotificationHelper.java b/src/main/java/com/marianhello/bgloc/sync/NotificationHelper.java index 9be96879..0959766e 100644 --- a/src/main/java/com/marianhello/bgloc/sync/NotificationHelper.java +++ b/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; diff --git a/src/main/java/com/marianhello/bgloc/sync/SyncAdapter.java b/src/main/java/com/marianhello/bgloc/sync/SyncAdapter.java index 9c713e98..c2fe3926 100644 --- a/src/main/java/com/marianhello/bgloc/sync/SyncAdapter.java +++ b/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; diff --git a/src/test/java/com/marianhello/backgroundgeolocation/BackgroundLocationTest.java b/src/test/java/com/marianhello/backgroundgeolocation/BackgroundLocationTest.java index 145816ab..35ffe15d 100644 --- a/src/test/java/com/marianhello/backgroundgeolocation/BackgroundLocationTest.java +++ b/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; diff --git a/src/test/java/com/marianhello/backgroundgeolocation/ConfigTest.java b/src/test/java/com/marianhello/backgroundgeolocation/ConfigTest.java index 01ee7f94..80ab3d89 100644 --- a/src/test/java/com/marianhello/backgroundgeolocation/ConfigTest.java +++ b/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; diff --git a/src/test/java/com/marianhello/backgroundgeolocation/DBLogReaderTest.java b/src/test/java/com/marianhello/backgroundgeolocation/DBLogReaderTest.java index 39e3d3e8..6072a6f3 100644 --- a/src/test/java/com/marianhello/backgroundgeolocation/DBLogReaderTest.java +++ b/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; diff --git a/src/test/java/com/marianhello/backgroundgeolocation/PostLocationTaskTest.java b/src/test/java/com/marianhello/backgroundgeolocation/PostLocationTaskTest.java index 5cb161f3..5a5c6add 100644 --- a/src/test/java/com/marianhello/backgroundgeolocation/PostLocationTaskTest.java +++ b/src/test/java/com/marianhello/backgroundgeolocation/PostLocationTaskTest.java @@ -10,7 +10,6 @@ import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -116,6 +115,8 @@ public void persistTask() throws ProtocolException, InterruptedException { @Test public void persistTaskShouldRejectAfterShutdown() { + exception.expect(RejectedExecutionException.class); + LocationDAO mockDAO = mock(LocationDAO.class); PostLocationTaskListener mockListener = mock(PostLocationTaskListener.class); From 2c0119dee214b129adb796261497842ba4a235ec Mon Sep 17 00:00:00 2001 From: David Guerin Date: Sat, 29 Feb 2020 19:55:33 +0100 Subject: [PATCH 2/2] fix(versions-file): fix VERSIONS.gradle file --- VERSIONS.gradle | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/VERSIONS.gradle b/VERSIONS.gradle index 17a06239..fee3ff35 100644 --- a/VERSIONS.gradle +++ b/VERSIONS.gradle @@ -21,13 +21,12 @@ def RESOURCE_PREFIX = "mauron85_bgloc_" ext { getApplicationId = { -> def applicationId = "com.marianhello.app" - // if (findProject('..:app') != null) { - // applicationId = project('..:app').android.defaultConfig.applicationId - // } else if (findProject(':app') != null) { - // applicationId = project(':app').android.defaultConfig.applicationId - // } if (rootProject.hasProperty('applicationId')) { applicationId = rootProject.applicationId + } else if (findProject('..:app') != null) { + applicationId = project('..:app').android.defaultConfig.applicationId + } else if (findProject(':app') != null) { + applicationId = project(':app').android.defaultConfig.applicationId } return applicationId }