Skip to content

Commit 31afbb4

Browse files
yongceyongce
committed
Use property instead of function for ServiceConnector
1 parent 1d738be commit 31afbb4

File tree

7 files changed

+153
-90
lines changed

7 files changed

+153
-90
lines changed

‎android_project_common.gradle‎

Lines changed: 99 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,33 @@ ext {
3636

3737
// Android official support
3838
'kotlin' : "1.3.31",
39-
'supportLib' : "28.0.0",
4039
'multidexLib' : "2.0.1",
40+
'androidxCore' : "1.0.2",
41+
'fragment' : "1.0.0",
42+
'preference' : "1.0.0",
43+
'palette' : "1.0.0",
44+
'recyclerView' : "1.0.0",
4145
'constraintLayout' : "1.1.3",
46+
'vectorDrawable' : "1.0.0",
4247
'lintLib' : "26.4.0",
4348
'archCore' : "2.0.0",
4449
'lifecycle' : "2.0.0",
4550
'room' : "2.0.0",
51+
'sqlite' : "2.0.1",
52+
'navigation' : "2.0.0",
53+
'paging' : "2.1.0",
54+
'work' : "2.0.1",
4655

4756
// test
48-
'runner' : "1.1.0",
49-
'rules' : "1.1.0",
50-
'truth' : "0.42",
57+
'testCore' : "1.2.0",
5158
'espresso' : "3.1.0",
5259
'uiautomator' : "2.2.0",
60+
'truth' : "0.42",
5361
'hamcrest' : "1.3",
5462
'mockito' : "1.10.19",
5563
'powermock' : "1.6.4",
56-
'robolectric' : "3.8",
64+
'robolectric' : "4.2",
65+
'mockk' : "1.9.3",
5766

5867
// google
5968
'gms' : "16.0.0",
@@ -81,7 +90,7 @@ ext {
8190

8291
// rx
8392
'rxjava' : "2.1.6",
84-
'rxandroid' : "2.0.2",
93+
'rxandroid' : "2.1.1",
8594

8695
// ycdev
8796
'androidLib' : "1.4.0",
@@ -91,65 +100,115 @@ ext {
91100
]
92101
deps = [
93102
// Android official support
103+
'kotlin': [
104+
'stdlib' : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}",
105+
],
94106
'androidx': [
95-
'annotation' : "androidx.annotation:annotation:1.0.2",
96-
'core' : "androidx.core:core:1.0.0",
97-
'media' : "androidx.media:media:1.0.0",
98-
'fragment' : "androidx.fragment:fragment:1.0.0",
99-
'appcompat' : "androidx.appcompat:appcompat:1.0.0",
107+
// core
108+
'annotation' : "androidx.annotation:annotation:1.1.0",
109+
'core' : "androidx.core:core:${versions.androidxCore}",
110+
'coreKtx' : "androidx.core:core-ktx:${versions.androidxCore}",
111+
'fragment' : "androidx.fragment:fragment:${versions.fragment}",
112+
'fragmentKtx' : "androidx.fragment:fragment-ktx:${versions.fragment}",
113+
'localBroadcast' : "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0",
114+
'collection' : "androidx.collection:collection:1.0.0",
115+
'collectionKtx' : "androidx.collection:collection-ktx:1.0.0",
116+
// UI
117+
'appcompat' : "androidx.appcompat:appcompat:1.0.2",
118+
'design' : "com.google.android.material:material:1.0.0",
119+
'preference' : "androidx.preference:preference:${versions.preference}",
120+
'preferenceKtx' : "androidx.preference:preference-ktx:${versions.preference}",
121+
'constraintLayout' : "androidx.constraintlayout:constraintlayout:1.1.3",
100122
'cardview' : "androidx.cardview:cardview:1.0.0",
101123
'gridlayout' : "androidx.gridlayout:gridlayout:1.0.0",
124+
'palette' : "androidx.palette:palette:${versions.palette}",
125+
'paletteKtx' : "androidx.palette:palette-ktx:${versions.palette}",
126+
'recyclerview' : "androidx.recyclerview:recyclerview:${versions.recyclerView}",
127+
'recyclerviewSelection' : "androidx.recyclerview:recyclerview:${versions.recyclerView}",
128+
'percent' : "androidx.percentlayout:percentlayout:1.0.0",
129+
'coordinatorLayout' : "androidx.coordinatorlayout:coordinatorlayout:1.0.0",
130+
'drawerLayout' : "androidx.drawerlayout:drawerlayout:1.0.0",
131+
'swipeRefreshLayout' : "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0",
132+
'viewPager' : "androidx.viewpager:viewpager:1.0.0",
133+
'vectorDrawable' : "androidx.vectordrawable:vectordrawable:${versions.vectorDrawable}",
134+
'animatedVectorDrawable' : "androidx.vectordrawable:vectordrawable-animated:${versions.vectorDrawable}",
135+
'customtabs' : "androidx.browser:browser:1.0.0",
136+
'transition' : "androidx.transition:transition:1.0.1",
137+
// others
138+
'multidex' : "androidx.multidex:multidex:${versions.multidexLib}",
139+
'mediaCompat' : "androidx.media:media:1.0.1",
102140
'mediarouter' : "androidx.mediarouter:mediarouter:1.0.0",
103-
'palette' : "androidx.palette:palette:1.0.0",
104-
'design' : "com.google.android.material:material:1.0.0",
105-
'recyclerview' : "androidx.recyclerview:recyclerview:1.0.0",
106-
'vectorDrawable' : "androidx.versionedparcelable:versionedparcelable:1.0.0",
107-
'animatedVectorDrawable' : "androidx.vectordrawable:vectordrawable-animated:1.0.0",
108-
'browser' : "androidx.browser:browser:1.0.0",
109141
'exifinterface' : "androidx.exifinterface:exifinterface:1.0.0",
110142
'wear' : "androidx.wear:wear:1.0.0",
111-
112-
'constraintLayout' : "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}",
113-
'multidex' : "androidx.multidex:multidex:${versions.multidexLib}",
114-
],
115-
'kotlin': [
116-
'stdlib' : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}",
143+
// legacy
144+
'coreUtils' : "androidx.legacy:legacy-support-core-utils:1.0.0",
145+
'coreUi' : "androidx.legacy:legacy-support-core-ui:1.0.0",
146+
'supportV13' : "androidx.legacy:legacy-support-v13:1.0.0",
117147
],
118148
'archCore': [
119149
'common' : "androidx.arch.core:core-common:${versions.archCore}",
120-
'core' : "androidx.arch.core:core:${versions.archCore}",
121-
'testing' : "androidx.arch.core:core-testing:${versions.archCore}",
122150
'runtime' : "androidx.arch.core:core-runtime:${versions.archCore}",
151+
'test' : "androidx.arch.core:core-testing:${versions.archCore}",
123152
],
124153
'lifecycle': [
125-
'common' : "androidx.lifecycle:lifecycle-common:${versions.lifecycle}",
126-
'commonJava8' : "androidx.lifecycle:lifecycle-common-java8:${versions.lifecycle}",
154+
'runtime' : "androidx.lifecycle:lifecycle-runtime:${versions.lifecycle}",
127155
'compiler' : "androidx.lifecycle:lifecycle-compiler:${versions.lifecycle}",
156+
'commonJava8' : "androidx.lifecycle:lifecycle-common-java8:${versions.lifecycle}",
128157
'extensions' : "androidx.lifecycle:lifecycle-extensions:${versions.lifecycle}",
129158
'reactiveStreams' : "androidx.lifecycle:lifecycle-reactivestreams:${versions.lifecycle}",
130-
"livedata" : "androidx.lifecycle:lifecycle-livedata:${versions.lifecycle}",
131-
"livedataCore" : "androidx.lifecycle:lifecycle-livedata-core:${versions.lifecycle}",
132-
"viewmodel" : "androidx.lifecycle:lifecycle-viewmodel:${versions.lifecycle}",
133-
'runtime' : "androidx.lifecycle:lifecycle-runtime:${versions.lifecycle}",
134-
135159
],
136160
'room': [
137-
'common' : "androidx.room:room-common:${versions.room}",
138161
'runtime' : "androidx.room:room-runtime:${versions.room}",
139162
'compiler' : "androidx.room:room-compiler:${versions.room}",
140163
'rxjava' : "androidx.room:room-rxjava2:${versions.room}",
141164
'testing' : "androidx.room:room-testing:${versions.room}",
142165
],
166+
'sqlite': [
167+
'sqlite' : "androidx.sqlite:sqlite:${versions.sqlite}",
168+
'sqliteKtx' : "androidx.sqlite:sqlite-ktx:${versions.sqlite}",
169+
'framework' : "androidx.sqlite:sqlite-framework:${versions.sqlite}",
170+
],
171+
'navigation': [
172+
'common' : "androidx.navigation:navigation-common:${versions.navigation}",
173+
'commonKtx' : "androidx.navigation:navigation-common-ktx:${versions.navigation}",
174+
'fragment' : "androidx.navigation:navigation-fragment:${versions.navigation}",
175+
'fragmentKtx' : "androidx.navigation:navigation-fragment-ktx:${versions.navigation}",
176+
'runtime' : "androidx.navigation:navigation-runtime:${versions.navigation}",
177+
'runtimeKtx' : "androidx.navigation:navigation-runtime-ktx:${versions.navigation}",
178+
'ui' : "androidx.navigation:navigation-ui:${versions.navigation}",
179+
'uiKtx' : "androidx.navigation:navigation-ui-ktx:${versions.navigation}",
180+
],
181+
'paging': [
182+
'common' : "androidx.paging:paging-common:${versions.paging}",
183+
'commonKtx' : "androidx.paging:paging-common-ktx:${versions.paging}",
184+
'runtime' : "androidx.paging:paging-runtime:${versions.paging}",
185+
'runtimeKtx' : "androidx.paging:paging-runtime-ktx:${versions.paging}",
186+
'rxjava2' : "androidx.paging:paging-rxjava2:${versions.paging}",
187+
'rxjava2Ktx' : "androidx.paging:paging-rxjava2-ktx:${versions.paging}",
188+
],
189+
'work': [
190+
"runtime" : "androidx.work:work-runtime:${versions.work}",
191+
"runtimeKtx" : "androidx.work:work-runtime-ktx:${versions.work}",
192+
"rxjava2" : "androidx.work:work-rxjava2:${versions.work}",
193+
"test" : "androidx.work:work-testing:${versions.work}",
194+
],
143195

144196
// test
145197
'test': [
146-
'core' : "androidx.test:core:1.0.0",
147-
'junit' : "androidx.test.ext:junit:1.0.0",
148-
'runner' : "androidx.test:runner:${versions.runner}",
149-
'rules' : "androidx.test:rules:${versions.rules}",
198+
// core
199+
'core' : "androidx.test:core:${versions.testCore}",
200+
'coreKtx' : "androidx.test:core-ktx:${versions.testCore}",
201+
'runner' : "androidx.test:runner:${versions.testCore}",
202+
'rules' : "androidx.test:rules:${versions.testCore}",
203+
'monitor' : "androidx.test:monitor:${versions.testCore}",
204+
'orchestrator' : "androidx.test:orchestrator:${versions.testCore}",
205+
'truthAndroidX' : 'androidx.test.ext:truth:${versions.testCore}',
206+
// ext
207+
'junit' : "androidx.test.ext:junit:1.1.1",
208+
'junitKtx' : "androidx.test.ext:junit-ktx:1.1.1",
150209
'truth' : "com.google.truth:truth:${versions.truth}",
151210
'truthJava8' : "com.google.truth.extensions:truth-java8-extension:${versions.truth}",
152-
'truthAndroidX' : 'androidx.test.ext:truth:1.0.0',
211+
// espresso
153212
'espressoCore' : "androidx.test.espresso:espresso-core:${versions.espresso}",
154213
'espressoContrib' : "androidx.test.espresso:espresso-contrib:${versions.espresso}",
155214
'espressoIntents' : "androidx.test.espresso:espresso-intents:${versions.espresso}",
@@ -160,6 +219,8 @@ ext {
160219
'mockitoCore' : "org.mockito:mockito-core:${versions.mockito}",
161220
'powermockMockito' : "org.powermock:powermock-api-mockito:${versions.powermock}",
162221
'powermockJunit' : "org.powermock:powermock-module-junit4:${versions.powermock}",
222+
'mockk' : "io.mockk:mockk:${versions.mockk}",
223+
'mockkAndroid' : "io.mockk:mockk-android:${versions.mockk}",
163224
'robolectric' : "org.robolectric:robolectric:${versions.robolectric}",
164225
],
165226

‎archLintRulesTestDemo/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies {
3939

4040
// The following dependencies are just for checking new versions of library
4141
implementation "androidx.multidex:multidex:${versions.multidexLib}"
42-
implementation "androidx.annotation:annotation:1.0.2"
42+
implementation "androidx.annotation:annotation:1.1.0"
4343
implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
4444
implementation "androidx.arch.core:core-common:${versions.archCore}"
4545
implementation "androidx.lifecycle:lifecycle-common:${versions.lifecycle}"
@@ -70,9 +70,9 @@ dependencies {
7070

7171
implementation "com.google.zxing:core:${versions.zxing}"
7272

73-
testImplementation "junit:junit:$versions.junit"
74-
testImplementation "androidx.test:runner:${versions.runner}"
75-
testImplementation "androidx.test:rules:${versions.rules}"
73+
testImplementation "androidx.test.ext:junit:1.1.1"
74+
testImplementation "androidx.test:runner:${versions.testCore}"
75+
testImplementation "androidx.test:rules:${versions.testCore}"
7676
testImplementation "org.hamcrest:hamcrest-core:${versions.hamcrest}"
7777
testImplementation "org.mockito:mockito-core:${versions.mockito}"
7878
testImplementation "org.powermock:powermock-api-mockito:${versions.powermock}"

‎baseLib/src/androidTest/java/me/ycdev/android/lib/common/ipc/ServiceClientBaseTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ class ServiceClientBaseTest {
9696
val latch = CountDownLatch(1)
9797
client.addOperation(HelloOperation("Hello, world").setNotifier(latch))
9898

99-
assertThat(client.serviceConnector.getService()).isNull()
99+
assertThat(client.serviceConnector.service).isNull()
100100
latch.await()
101-
assertThat(client.serviceConnector.getService()).isNotNull()
101+
assertThat(client.serviceConnector.service).isNotNull()
102102
timeStart = SystemClock.elapsedRealtime()
103103
}
104104

0 commit comments

Comments
 (0)