Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(androidx): moved to androidx #42

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(androidx): moved to androidx #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87e58b9
feat(androidx): moved to androidx
Feb 29, 2020
2c0119d
fix(versions-file): fix VERSIONS.gradle file
Feb 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions VERSIONS.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@ def RESOURCE_PREFIX = "mauron85_bgloc_"
ext {
getApplicationId = { ->
def applicationId = "com.marianhello.app"
if (findProject('..:app') != null) {
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
}
if (rootProject.hasProperty('applicationId')) {
applicationId = rootProject.applicationId
}
return applicationId
}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/androidTest/java/com/marianhello/bgloc/BackgroundGeolocationFacadeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/androidTest/java/com/marianhello/bgloc/BatchManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/androidTest/java/com/marianhello/bgloc/ContentProviderLocationDAOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/androidTest/java/com/marianhello/bgloc/DBLogReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
11 changes: 4 additions & 7 deletions src/androidTest/java/com/marianhello/bgloc/LocationServiceProxyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions src/androidTest/java/com/marianhello/bgloc/LocationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 3 additions & 5 deletions src/androidTest/java/com/marianhello/bgloc/SQLiteConfigurationDAOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -24,7 +23,6 @@

import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashSet;

/**
* Created by finch on 13/07/16.
Expand Down
6 changes: 3 additions & 3 deletions src/androidTest/java/com/marianhello/bgloc/SQLiteLocationDAOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/androidTest/java/com/marianhello/bgloc/SQLiteLocationDAOThreadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/androidTest/java/com/marianhello/bgloc/SQLiteOpenHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/marianhello/bgloc/BackgroundGeolocationFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/marianhello/bgloc/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/marianhello/bgloc/data/BackgroundLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/marianhello/bgloc/data/LocationTransform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/marianhello/bgloc/service/LocationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/marianhello/bgloc/service/LocationServiceIntentBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/marianhello/bgloc/sync/NotificationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/marianhello/bgloc/sync/SyncAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/marianhello/backgroundgeolocation/BackgroundLocationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/marianhello/backgroundgeolocation/ConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/marianhello/backgroundgeolocation/DBLogReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.marianhello.backgroundgeolocation;

import android.support.test.filters.SmallTest;
import androidx.test.filters.SmallTest;

import com.marianhello.logging.DBLogReader;

Expand Down
3 changes: 2 additions & 1 deletion src/test/java/com/marianhello/backgroundgeolocation/PostLocationTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down