Skip to content

Commit faacacc

Browse files
yongceyongce
committed
Migrating to AndroidX
1 parent 3811f6d commit faacacc

File tree

96 files changed

+237
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+237
-226
lines changed

‎android_module_common.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ android {
6161
ROOT_GIT_COMMIT_SHA1: getRootProjectLastCommitSha1()
6262
]
6363

64-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
64+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
6565
}
6666

6767
if (project.plugins.hasPlugin("com.android.application")) {

‎android_project_common.gradle‎

Lines changed: 60 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ allprojects {
1515
} else {
1616
details.useVersion versions.supportLib
1717
}
18-
} else if (details.requested.group == 'android.arch.core') {
18+
} else if (details.requested.group == 'androidx.arch.core') {
19+
details.useVersion versions.archCore
20+
} else if (details.requested.group == 'androidx.lifecycle') {
1921
details.useVersion versions.lifecycle
20-
} else if (details.requested.group == 'android.arch.lifecycle') {
21-
details.useVersion versions.lifecycle
22-
} else if (details.requested.group == 'android.arch.persistence.room') {
22+
} else if (details.requested.group == 'androidx.room') {
2323
details.useVersion versions.room
2424
}
2525
}
@@ -35,26 +35,27 @@ ext {
3535
'compileSdk' : 28,
3636

3737
// Android official support
38-
'supportLib' : "27.1.1",
39-
'multidexLib' : "1.0.2",
38+
'supportLib' : "28.0.0",
39+
'multidexLib' : "2.0.0",
4040
'constraintLayout' : "1.1.3",
4141
'lintLib' : "26.2.0",
42-
'lifecycle' : "1.1.0",
43-
'room' : "1.1.0",
42+
'archCore' : "2.0.0-rc01",
43+
'lifecycle' : "2.0.0-rc01",
44+
'room' : "2.0.0-rc01",
4445

4546
// test
4647
'junit' : "4.12",
47-
'runner' : "1.0.2",
48-
'rules' : "1.0.2",
49-
'espresso' : "3.0.1",
50-
'uiautomator' : "2.1.2",
48+
'runner' : "1.1.0",
49+
'rules' : "1.1.0",
50+
'espresso' : "3.1.0",
51+
'uiautomator' : "2.2.0",
5152
'hamcrest' : "1.3",
5253
'mockito' : "1.10.19",
5354
'powermock' : "1.6.4",
5455
'robolectric' : "3.8",
5556

5657
// google
57-
'gms' : "11.4.2",
58+
'gms' : "16.0.0",
5859
'wearableSupport' : "2.3.0",
5960

6061
// infrastructure
@@ -86,61 +87,66 @@ ext {
8687
// others
8788
'zxing' : "3.3.1",
8889
]
90+
8991
deps = [
9092
// Android official support
91-
'support': [
92-
'annotations' : "com.android.support:support-annotations:${versions.supportLib}",
93-
'compat' : "com.android.support:support-compat:${versions.supportLib}",
94-
'coreUtils' : "com.android.support:support-core-utils:${versions.supportLib}",
95-
'coreUi' : "com.android.support:support-core-ui:${versions.supportLib}",
96-
'mediaCompat' : "com.android.support:support-media-compat:${versions.supportLib}",
97-
'fragment' : "com.android.support:support-fragment:${versions.supportLib}",
98-
'supportV13' : "com.android.support:support-v13:${versions.supportLib}",
99-
'appcompat' : "com.android.support:appcompat-v7:${versions.supportLib}",
100-
'cardview' : "com.android.support:cardview-v7:${versions.supportLib}",
101-
'gridlayout' : "com.android.support:gridlayout-v7:${versions.supportLib}",
102-
'mediarouter' : "com.android.support:mediarouter-v7:${versions.supportLib}",
103-
'palette' : "com.android.support:palette-v7:${versions.supportLib}",
104-
'design' : "com.android.support:design:${versions.supportLib}",
105-
'recyclerview' : "com.android.support:recyclerview-v7:${versions.supportLib}",
106-
'percent' : "com.android.support:percent:${versions.supportLib}",
107-
'vectorDrawable' : "com.android.support:support-vector-drawable:${versions.supportLib}",
108-
'animatedVectorDrawable' : "com.android.support:animated-vector-drawable:${versions.supportLib}",
109-
'customtabs' : "com.android.support:customtabs:${versions.supportLib}",
110-
'exifinterface' : "com.android.support:exifinterface:${versions.supportLib}",
111-
'wear' : "com.android.support:wear:${versions.supportLib}",
112-
113-
'constraintLayout' : "com.android.support.constraint:constraint-layout:${versions.constraintLayout}",
114-
'multidex' : "com.android.support:multidex:${versions.multidexLib}",
93+
'androidx': [
94+
'annotation' : "androidx.annotation:annotation:1.0.0",
95+
'core' : "androidx.core:core:1.0.0",
96+
'media' : "androidx.media:media:1.0.0",
97+
'fragment' : "androidx.fragment:fragment:1.0.0",
98+
'appcompat' : "androidx.appcompat:appcompat:1.0.0",
99+
'cardview' : "androidx.cardview:cardview:1.0.0",
100+
'gridlayout' : "androidx.gridlayout:gridlayout:1.0.0",
101+
'mediarouter' : "androidx.mediarouter:mediarouter:1.0.0",
102+
'palette' : "androidx.palette:palette:1.0.0",
103+
'design' : "com.google.android.material:material:1.0.0",
104+
'recyclerview' : "androidx.recyclerview:recyclerview:1.0.0",
105+
'vectorDrawable' : "androidx.versionedparcelable:versionedparcelable:1.0.0",
106+
'animatedVectorDrawable' : "androidx.vectordrawable:vectordrawable-animated:1.0.0",
107+
'browser' : "androidx.browser:browser:1.0.0",
108+
'exifinterface' : "androidx.exifinterface:exifinterface:1.0.0",
109+
'wear' : "androidx.wear:wear:1.0.0",
110+
111+
'constraintLayout' : "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}",
112+
'multidex' : "androidx.multidex:multidex:${versions.multidexLib}",
115113
],
116114
'archCore': [
117-
'coreTesting' : "android.arch.core:core-testing:${versions.lifecycle}",
115+
'common' : "androidx.arch.core:core-common:${versions.archCore}",
116+
'core' : "androidx.arch.core:core:${versions.archCore}",
117+
'testing' : "androidx.arch.core:core-testing:${versions.archCore}",
118+
'runtime' : "androidx.arch.core:core-runtime:${versions.archCore}",
118119
],
119120
'lifecycle': [
120-
'runtime' : "android.arch.lifecycle:runtime:${versions.lifecycle}",
121-
'compiler' : "android.arch.lifecycle:compiler:${versions.lifecycle}",
122-
'commonJava8' : "android.arch.lifecycle:common-java8:${versions.lifecycle}",
123-
'extensions' : "android.arch.lifecycle:extensions:${versions.lifecycle}",
124-
'reactiveStreams' : "android.arch.lifecycle:reactivestreams:${versions.lifecycle}",
121+
'common' : "androidx.lifecycle:lifecycle-common:${versions.lifecycle}",
122+
'commonJava8' : "androidx.lifecycle:lifecycle-common-java8:${versions.lifecycle}",
123+
'compiler' : "androidx.lifecycle:lifecycle-compiler:${versions.lifecycle}",
124+
'extensions' : "androidx.lifecycle:lifecycle-extensions:${versions.lifecycle}",
125+
'reactiveStreams' : "androidx.lifecycle:lifecycle-reactivestreams:${versions.lifecycle}",
126+
"livedata" : "androidx.lifecycle:lifecycle-livedata:${versions.lifecycle}",
127+
"livedataCore" : "androidx.lifecycle:lifecycle-livedata-core:${versions.lifecycle}",
128+
"viewmodel" : "androidx.lifecycle:lifecycle-viewmodel:${versions.lifecycle}",
129+
'runtime' : "androidx.lifecycle:lifecycle-runtime:${versions.lifecycle}",
125130

126131
],
127132
'room': [
128-
'runtime' : "android.arch.persistence.room:runtime:${versions.room}",
129-
'compiler' : "android.arch.persistence.room:compiler:${versions.room}",
130-
'rxjava' : "android.arch.persistence.room:rxjava2:${versions.room}",
131-
'testing' : "android.arch.persistence.room:testing:${versions.room}",
133+
'common' : "androidx.room:room-common:${versions.room}",
134+
'runtime' : "androidx.room:room-runtime:${versions.room}",
135+
'compiler' : "androidx.room:room-compiler:${versions.room}",
136+
'rxjava' : "androidx.room:room-rxjava2:${versions.room}",
137+
'testing' : "androidx.room:room-testing:${versions.room}",
132138
],
133139

134140
// test
135141
'test': [
136142
'junit' : "junit:junit:$versions.junit",
137-
'supportRunner' : "com.android.support.test:runner:${versions.runner}",
138-
'supportRules' : "com.android.support.test:rules:${versions.rules}",
139-
'espressoCore' : "com.android.support.test.espresso:espresso-core:${versions.espresso}",
140-
'espressoContrib' : "com.android.support.test.espresso:espresso-contrib:${versions.espresso}",
141-
'espressoIntents' : "com.android.support.test.espresso:espresso-intents:${versions.espresso}",
142-
'espressoIdling' : "com.android.support.test.espresso:espresso-idling-resource:${versions.espresso}",
143-
'uiautomator' : "com.android.support.test.uiautomator:uiautomator-v18:${versions.uiautomator}",
143+
'runner' : "androidx.test:runner:${versions.runner}",
144+
'rules' : "androidx.test:rules:${versions.rules}",
145+
'espressoCore' : "androidx.test.espresso:espresso-core:${versions.espresso}",
146+
'espressoContrib' : "androidx.test.espresso:espresso-contrib:${versions.espresso}",
147+
'espressoIntents' : "androidx.test.espresso:espresso-intents:${versions.espresso}",
148+
'espressoIdling' : "androidx.test.espresso:espresso-idling-resource:${versions.espresso}",
149+
'uiautomator' : "androidx.test.uiautomator:uiautomator:${versions.uiautomator}",
144150
'hamcrestCore' : "org.hamcrest:hamcrest-core:${versions.hamcrest}",
145151
'hamcrestLibrary' : "org.hamcrest:hamcrest-library:${versions.hamcrest}",
146152
'mockitoCore' : "org.mockito:mockito-core:${versions.mockito}",
@@ -198,5 +204,4 @@ ext {
198204
// others
199205
'zxingCore' : "com.google.zxing:core:${versions.zxing}",
200206
]
201-
202207
}

‎archLib/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
lintChecks project(':archLintRules')
1717
api project(':baseLib')
1818

19-
implementation deps.support.appcompat
19+
implementation deps.androidx.appcompat
2020
}
2121

2222
project.ext {

‎archLib/src/main/java/me/ycdev/android/arch/ArchConstants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.ycdev.android.arch;
22

3-
import android.support.annotation.IntDef;
3+
import androidx.annotation.IntDef;
44
import android.widget.Toast;
55

66
import java.lang.annotation.Retention;

‎archLib/src/main/java/me/ycdev/android/arch/activity/AppCompatBaseActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package me.ycdev.android.arch.activity;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.ActionBar;
5-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.ActionBar;
5+
import androidx.appcompat.app.AppCompatActivity;
66

77
/**
88
* Base class for Activity which wants to inherit
9-
* {@link android.support.v7.app.AppCompatActivity}.
9+
* {@link androidx.appcompat.app.AppCompatActivity}.
1010
*/
1111
public abstract class AppCompatBaseActivity extends AppCompatActivity {
1212
@Override

‎archLib/src/main/java/me/ycdev/android/arch/utils/AppLogger.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.ycdev.android.arch.utils;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
55
import android.util.Log;
66

77
import me.ycdev.android.lib.common.utils.FileLogger;

‎archLib/src/main/java/me/ycdev/android/arch/wrapper/ToastHelper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.ycdev.android.arch.wrapper;
22

33
import android.content.Context;
4-
import android.support.annotation.NonNull;
5-
import android.support.annotation.StringRes;
4+
import androidx.annotation.NonNull;
5+
import androidx.annotation.StringRes;
66
import android.widget.Toast;
77

88
import static me.ycdev.android.arch.ArchConstants.ToastDuration;

‎archLintRulesTestDemo/build.gradle‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ android {
88
targetSdkVersion 28
99
versionCode 1
1010
versionName "1.0"
11+
12+
multiDexEnabled true
1113
}
1214

1315
buildTypes {
@@ -31,12 +33,12 @@ android {
3133
dependencies {
3234
implementation project(':archLib')
3335

34-
implementation deps.support.appcompat
36+
implementation deps.androidx.appcompat
3537

3638
// The following dependencies are just for checking new versions of library
37-
// implementation "com.android.support:multidex:${versions.multidexLib}"
38-
implementation "com.android.support:support-annotations:${versions.supportLib}"
39-
implementation "com.android.support.constraint:constraint-layout:${versions.constraintLayout}"
39+
implementation "androidx.multidex:multidex:${versions.multidexLib}"
40+
implementation "androidx.annotation:annotation:1.0.0"
41+
implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
4042

4143
implementation ("com.google.android.gms:play-services-auth:${versions.gms}", {
4244
exclude group: 'com.android.support'
@@ -64,14 +66,14 @@ dependencies {
6466
implementation "com.google.zxing:core:${versions.zxing}"
6567

6668
testImplementation "junit:junit:$versions.junit"
67-
testImplementation "com.android.support.test:runner:${versions.runner}"
68-
testImplementation "com.android.support.test:rules:${versions.rules}"
69+
testImplementation "androidx.test:runner:${versions.runner}"
70+
testImplementation "androidx.test:rules:${versions.rules}"
6971
testImplementation "org.hamcrest:hamcrest-core:${versions.hamcrest}"
7072
testImplementation "org.mockito:mockito-core:${versions.mockito}"
7173
testImplementation "org.powermock:powermock-api-mockito:${versions.powermock}"
7274
testImplementation "org.robolectric:robolectric:${versions.robolectric}"
7375

74-
androidTestImplementation "com.android.support.test.espresso:espresso-core:${versions.espresso}"
75-
androidTestImplementation "com.android.support.test.uiautomator:uiautomator-v18:${versions.uiautomator}"
76+
androidTestImplementation "androidx.test.espresso:espresso-core:${versions.espresso}"
77+
androidTestImplementation "androidx.test.uiautomator:uiautomator:${versions.uiautomator}"
7678
}
7779

‎archLintRulesTestDemo/src/main/java/me/ycdev/android/arch/demo/activity/LintViolationActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import android.content.Intent;
66
import android.content.IntentFilter;
77
import android.os.Bundle;
8-
import android.support.v7.app.AppCompatActivity;
8+
import androidx.appcompat.app.AppCompatActivity;
99
import android.view.MenuItem;
1010

1111

‎baseLib/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ android {
1414
}
1515

1616
dependencies {
17-
api deps.support.annotations
18-
implementation deps.support.compat
19-
implementation deps.support.fragment
17+
api deps.androidx.annotation
18+
implementation deps.androidx.core
19+
implementation deps.androidx.fragment
2020
implementation deps.gson
2121
implementation deps.timber
2222

2323
// Dependencies for local unit tests
2424
testImplementation project(':testLib')
2525
testImplementation deps.test.junit
26-
testImplementation deps.test.supportRunner
27-
testImplementation deps.test.supportRules
26+
testImplementation deps.test.runner
27+
testImplementation deps.test.rules
2828
testImplementation deps.test.mockitoCore
2929
testImplementation deps.test.hamcrestCore
3030
testImplementation deps.test.hamcrestLibrary
@@ -33,8 +33,8 @@ dependencies {
3333
testImplementation deps.test.robolectric
3434

3535
// Android Testing Support Library's runner and rules
36-
androidTestImplementation deps.test.supportRunner
37-
androidTestImplementation deps.test.supportRules
36+
androidTestImplementation deps.test.runner
37+
androidTestImplementation deps.test.rules
3838
androidTestImplementation deps.test.hamcrestLibrary
3939
}
4040

0 commit comments

Comments
 (0)