Skip to content

Commit 011a42b

Browse files
mohd-akrammohd-akram
committed
Use androidx
1 parent 2693e07 commit 011a42b

24 files changed

Lines changed: 68 additions & 74 deletions

‎VERSIONS.gradle‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,15 @@ def DEFAULT_BUILD_TOOLS_VERSION = "28.0.3"
55
def DEFAULT_TARGET_SDK_VERSION = 28
66
def DEFAULT_MIN_SDK_VERSION = 16
77
def DEFAULT_PLAY_SERVICES_VERSION = "11+"
8-
def DEFAULT_SUPPORT_LIB_VERSION = "28.0.0"
98
def DEFAULT_REACT_NATIVE_LIB_VERSION = "+"
109

1110
def MOCKITO_CORE_VERSION = "1.10.19"
1211
def POWERMOCK_VERSION = "1.6.2"
1312
def ROBOLECTRIC_VERSION = "3.0"
14-
def UI_AUTOMATOR_VERSION = "2.1.2"
13+
def UI_AUTOMATOR_VERSION = "1.2.0"
1514
def JUNIT_VERSION = "4.12"
1615
def FEST_ASSERT_CORE_VERSION = "2.0M10"
17-
def SUPPORT_TEST_VERSION = "1.0.2"
18-
def SUPPORTX_TEST_VERSION = "1.1.0"
16+
def ANDROIDX_TEST_VERSION = "1.2.0"
1917
def RESOURCE_PREFIX = "mauron85_bgloc_"
2018

2119
ext {
@@ -60,14 +58,6 @@ ext {
6058
return playServicesVersion
6159
}
6260

63-
getSupportLibVersion = { ->
64-
def supportLibVersion = DEFAULT_SUPPORT_LIB_VERSION
65-
if (rootProject.hasProperty('supportLibVersion')) {
66-
supportLibVersion = rootProject.supportLibVersion
67-
}
68-
return supportLibVersion
69-
}
70-
7161
getCompileSdkVersion = { ->
7262
def compileSdkVersion = DEFAULT_COMPILE_SDK_VERSION
7363
if (rootProject.hasProperty('compileSdkVersion')) {
@@ -117,19 +107,20 @@ ext {
117107
}
118108

119109
androidLibs = [
120-
supportAnnotations: [group: 'com.android.support', name: 'support-annotations', version: '24.0.0'],
121-
supportCompat: [group: 'com.android.support', name: 'support-compat', version: getSupportLibVersion()],
122-
appcompat: [group: 'com.android.support', name: 'appcompat-v7', version: getSupportLibVersion()],
110+
androidxCore: [group: 'androidx.core', name: 'core', version: '1.3.0'],
111+
annotations: [group: 'androidx.annotation', name: 'annotation', version: '1.1.0'],
112+
appcompat: [group: 'androidx.appcompat', name: 'appcompat', version: '1.1.0'],
113+
localbroadcastmanager: [group: 'androidx.localbroadcastmanager', name: 'localbroadcastmanager', version: '1.0.0'],
123114
playServicesLocation: [group: 'com.google.android.gms', name: 'play-services-location', version: getPlayServicesVersion()],
124115
testCore: [group: 'androidx.test', name: 'core', version: '1.0.0'],
125-
testRunner: [group: 'androidx.test', name: 'runner', version: SUPPORTX_TEST_VERSION],
126-
testRules: [group: 'androidx.test', name: 'rules', version: SUPPORTX_TEST_VERSION],
116+
testRunner: [group: 'androidx.test', name: 'runner', version: ANDROIDX_TEST_VERSION],
117+
testRules: [group: 'androidx.test', name: 'rules', version: ANDROIDX_TEST_VERSION],
127118
]
128119

129120
testLibs = [
130-
testRunner: [group: 'com.android.support.test', name: 'runner', version: SUPPORT_TEST_VERSION],
131-
testRules: [group: 'com.android.support.test', name: 'rules', version: SUPPORT_TEST_VERSION],
132-
uiautomator: [group: 'com.android.support.test.uiautomator', name: 'uiautomator-v18', version: UI_AUTOMATOR_VERSION],
121+
testRunner: [group: 'androidx.test', name: 'runner', version: ANDROIDX_TEST_VERSION],
122+
testRules: [group: 'androidx.test', name: 'rules', version: ANDROIDX_TEST_VERSION],
123+
uiautomator: [group: 'androidx.test.uiautomator', name: 'uiautomator', version: UI_AUTOMATOR_VERSION],
133124
junit: [group: 'junit', name: 'junit', version: JUNIT_VERSION],
134125
json: [group: 'org.json', name: 'json', version: '20140107'],
135126
powermockMockito: [group: 'org.powermock', name: 'powermock-api-mockito', version: POWERMOCK_VERSION],

‎build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def resourcePrefix = getResourcePrefix()
66

77
// https://hackernoon.com/android-how-to-add-gradle-dependencies-using-foreach-c4cbcc070458
88
def projDependencies = [
9-
[configuration: "androidTestImplementation", dependency: androidLibs.supportAnnotations],
9+
[configuration: "androidTestImplementation", dependency: androidLibs.annotations],
1010
[configuration: "androidTestImplementation", dependency: testLibs.testRunner],
1111
[configuration: "androidTestImplementation", dependency: testLibs.testRules],
1212
[configuration: "testImplementation", dependency: testLibs.testRunner],
@@ -16,10 +16,11 @@ def projDependencies = [
1616
[configuration: "testImplementation", dependency: testLibs.robolectric],
1717
[configuration: "testImplementation", dependency: testLibs.mockitoCore],
1818
[configuration: "implementation", dependency: androidLibs.playServicesLocation],
19-
[configuration: "implementation", dependency: androidLibs.supportCompat],
19+
[configuration: "implementation", dependency: androidLibs.androidxCore],
20+
[configuration: "implementation", dependency: androidLibs.localbroadcastmanager],
2021
[configuration: "implementation", dependency: androidLibs.appcompat],
2122
[configuration: "implementation", dependency: libs.permissions,
22-
options: { exclude group: 'com.android.support', module: 'appcompat-v7'}],
23+
options: { exclude group: 'androidx.appcompat', module: 'appcompat'}],
2324
[configuration: "implementation", dependency: libs.logback],
2425
[configuration: "implementation", dependency: libs.slf4j],
2526
[configuration: "implementation", dependency: libs.promise],
@@ -64,7 +65,7 @@ android {
6465
resValue "string", resourcePrefix + "account_name", 'Locations'
6566
resValue "string", resourcePrefix + "account_type", accountPrefix + '.account'
6667
resValue "string", resourcePrefix + "content_authority", accountPrefix + '.provider'
67-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
68+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
6869
minSdkVersion project.ext.getMinSdkVersion()
6970
versionCode 1
7071
versionName "1.0"

‎gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
android.enableUnitTestBinaryResources=true
22
android.builder.sdkDownload=true
3+
android.useAndroidX=true
4+
android.enableJetifier=true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.marianhello.bgloc;
22

3-
import android.support.test.InstrumentationRegistry;
4-
import android.support.test.runner.AndroidJUnit4;
3+
import androidx.test.InstrumentationRegistry;
4+
import androidx.test.runner.AndroidJUnit4;
55

66
import com.marianhello.bgloc.data.BackgroundLocation;
77
import com.marianhello.bgloc.provider.TestLocationProviderFactory;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import android.content.Context;
44
import android.database.sqlite.SQLiteDatabase;
5-
import android.support.test.InstrumentationRegistry;
6-
import android.support.test.runner.AndroidJUnit4;
7-
import android.support.test.filters.SmallTest;
5+
import androidx.test.InstrumentationRegistry;
6+
import androidx.test.runner.AndroidJUnit4;
7+
import androidx.test.filters.SmallTest;
88
import android.util.JsonReader;
99
import android.util.JsonToken;
1010

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.util.Collection;
1717
import java.util.Iterator;
1818

19-
import static android.support.test.InstrumentationRegistry.getContext;
19+
import static androidx.test.InstrumentationRegistry.getContext;
2020
import static com.marianhello.bgloc.data.sqlite.SQLiteLocationContract.LocationEntry.SQL_DROP_LOCATION_TABLE;
2121
import static junit.framework.Assert.assertEquals;
2222

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.marianhello.bgloc;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
6-
import android.support.test.filters.SmallTest;
4+
import androidx.test.InstrumentationRegistry;
5+
import androidx.test.runner.AndroidJUnit4;
6+
import androidx.test.filters.SmallTest;
77

88
import com.marianhello.logging.DBLogReader;
99
import com.marianhello.logging.LogEntry;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import android.content.IntentFilter;
77
import android.os.Bundle;
88
import android.os.IBinder;
9-
import android.support.test.InstrumentationRegistry;
10-
import android.support.test.rule.ServiceTestRule;
11-
import android.support.test.runner.AndroidJUnit4;
12-
import android.support.v4.content.LocalBroadcastManager;
9+
import androidx.test.InstrumentationRegistry;
10+
import androidx.test.rule.ServiceTestRule;
11+
import androidx.test.runner.AndroidJUnit4;
12+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
1313

1414
import com.marianhello.bgloc.provider.TestLocationProviderFactory;
1515
import com.marianhello.bgloc.service.LocationServiceImpl;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import android.location.Location;
88
import android.os.Bundle;
99
import android.os.IBinder;
10-
import android.support.annotation.NonNull;
11-
import android.support.annotation.Nullable;
12-
import android.support.test.InstrumentationRegistry;
13-
import android.support.test.rule.ServiceTestRule;
14-
import android.support.test.runner.AndroidJUnit4;
15-
import android.support.v4.content.LocalBroadcastManager;
10+
import androidx.annotation.NonNull;
11+
import androidx.annotation.Nullable;
12+
import androidx.test.InstrumentationRegistry;
13+
import androidx.test.rule.ServiceTestRule;
14+
import androidx.test.runner.AndroidJUnit4;
15+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
1616

1717
import com.marianhello.bgloc.data.BackgroundLocation;
1818
import com.marianhello.bgloc.provider.MockLocationProvider;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.content.Context;
44
import android.database.Cursor;
55
import android.database.sqlite.SQLiteDatabase;
6-
import android.support.test.InstrumentationRegistry;
7-
import android.support.test.runner.AndroidJUnit4;
8-
import android.support.test.filters.SmallTest;
6+
import androidx.test.InstrumentationRegistry;
7+
import androidx.test.runner.AndroidJUnit4;
8+
import androidx.test.filters.SmallTest;
99

1010
import com.marianhello.bgloc.Config;
1111
import com.marianhello.bgloc.data.HashMapLocationTemplate;
@@ -199,4 +199,4 @@ public void persistConfigurationWithComplexTemplate() throws JSONException {
199199
}
200200
}
201201

202-
}
202+
}

0 commit comments

Comments
 (0)