Skip to content

Commit 9794d5e

Browse files
jwfingjwfing
authored
Merge pull request #179 from jwfing/master
remove androidx dependency
2 parents 489bdb7 + 703085f commit 9794d5e

Some content is hidden

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

45 files changed

+6371
-114
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22

33
Following is change logs for recently release versions, you can refer to [releases page](https://github.com/leancloud/java-unified-sdk/releases) for more details.
44

5+
## 8.0.3 release
6+
7+
#### Break changes
8+
- None
9+
10+
#### New features
11+
- None
12+
13+
#### Optimization and fixed bugs
14+
- LCUser#loginAnonymously always returns the same LCUser, except for re-installation.
15+
- remove dependency of androidx in android sdk modules.
16+
517
## 8.0.2 release
618

719
#### Break changes

‎android-sdk/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ allprojects {
3030
}
3131

3232
ext {
33-
sdkVersion = "8.0.2"
33+
sdkVersion = "8.0.3"
3434
supportLibVersion = "26.1.0"
3535
converterVersion = "2.1.0"
3636
rxandroidVersion = "2.1.1"

‎android-sdk/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx1536m
1515
# This option should only be used with decoupled projects. More details, visit
1616
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1717
# org.gradle.parallel=true
18-
VERSION_NAME=8.0.2
18+
VERSION_NAME=8.0.3
1919
VERSION_CODE=2695
2020
GROUP=cn.leancloud
2121

‎android-sdk/leancloud-fcm/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ dependencies {
6666
// When using the BoM, you don't specify versions in Firebase library dependencies
6767
implementation 'com.google.firebase:firebase-messaging'
6868

69-
implementation 'androidx.appcompat:appcompat:1.0.0'
7069
testImplementation 'junit:junit:4.12'
7170
androidTestImplementation 'androidx.test:runner:1.1.0'
7271
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'

‎android-sdk/mixpush-android/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ dependencies {
6767

6868
implementation("cn.leancloud:realtime-core:${rootProject.ext.sdkVersion}")
6969

70-
implementation 'androidx.appcompat:appcompat:1.0.0'
7170
testImplementation 'junit:junit:4.12'
7271
androidTestImplementation 'androidx.test:runner:1.1.0'
7372
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'

‎android-sdk/mixpush-android/src/main/java/cn/leancloud/LCMixPushManager.java‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public static void turnOnVIVOPush(final LCCallback<Boolean> callback) {
277277
/**
278278
* current device support VIVO push or not.
279279
*
280-
* @param context
280+
* @param context context
281281
* @return
282282
*/
283283
public static boolean isSupportVIVOPush(Context context) {
@@ -287,9 +287,9 @@ public static boolean isSupportVIVOPush(Context context) {
287287
/**
288288
* bind vivo alias
289289
*
290-
* @param context
291-
* @param alias
292-
* @param callback
290+
* @param context context
291+
* @param alias alias
292+
* @param callback callback function
293293
*/
294294
public static void bindVIVOAlias(Context context, String alias, final LCCallback<Boolean> callback) {
295295
cn.leancloud.vivo.LCMixPushManager.bindVIVOAlias(context, alias, callback);
@@ -298,9 +298,9 @@ public static void bindVIVOAlias(Context context, String alias, final LCCallback
298298
/**
299299
* unbind vivo alias
300300
*
301-
* @param context
302-
* @param alias
303-
* @param callback
301+
* @param context context
302+
* @param alias alias
303+
* @param callback callback function
304304
*/
305305
public static void unbindVIVOAlias(Context context, String alias, final LCCallback<Boolean> callback) {
306306
cn.leancloud.vivo.LCMixPushManager.unbindVIVOAlias(context, alias, callback);
@@ -309,8 +309,8 @@ public static void unbindVIVOAlias(Context context, String alias, final LCCallba
309309
/**
310310
* get vivo alias
311311
*
312-
* @param context
313-
* @return
312+
* @param context context
313+
* @return alias
314314
*/
315315
public static String getVIVOAlias(Context context) {
316316
return cn.leancloud.vivo.LCMixPushManager.getVIVOAlias(context);
@@ -319,28 +319,28 @@ public static String getVIVOAlias(Context context) {
319319
/**
320320
* set vivo topic
321321
*
322-
* @param context
323-
* @param topic
324-
* @param callback
322+
* @param context context
323+
* @param topic topic
324+
* @param callback callback function
325325
*/
326326
public static void setVIVOTopic(Context context, String topic, final LCCallback<Boolean> callback) {
327327
cn.leancloud.vivo.LCMixPushManager.setVIVOTopic(context, topic, callback);
328328
}
329329

330330
/**
331331
* delete vivo topic
332-
* @param context
333-
* @param alias
334-
* @param callback
332+
* @param context context
333+
* @param alias alias
334+
* @param callback callback function
335335
*/
336336
public static void delVIVOTopic(Context context, String alias, final LCCallback<Boolean> callback) {
337337
cn.leancloud.vivo.LCMixPushManager.delVIVOTopic(context, alias, callback);
338338
}
339339

340340
/**
341341
* get vivo topics
342-
* @param context
343-
* @return
342+
* @param context context
343+
* @return topic list.
344344
*/
345345
public static List<String> getVIVOTopics(Context context) {
346346
return cn.leancloud.vivo.LCMixPushManager.getVIVOTopics(context);
@@ -357,7 +357,7 @@ public static List<String> getVIVOTopics(Context context) {
357357
* @param appKey oppo application key
358358
* @param appSecret oppo application secret
359359
* @param callback callback
360-
* @return
360+
* @return boolean: true - succeed, false - failed.
361361
*/
362362
public static boolean registerOppoPush(Context context, String appKey, String appSecret,
363363
LCOPPOPushAdapter callback) {
@@ -371,7 +371,7 @@ public static boolean registerOppoPush(Context context, String appKey, String ap
371371
* @param appSecret oppo application secret
372372
* @param profile profile string.
373373
* @param callback callback.
374-
* @return
374+
* @return boolean: true - succeed, false - failed.
375375
*/
376376
public static boolean registerOppoPush(Context context, String appKey, String appSecret,
377377
String profile,
@@ -383,8 +383,8 @@ public static boolean registerOppoPush(Context context, String appKey, String ap
383383
/**
384384
* judgement if support oppo push or not.
385385
*
386-
* @param context
387-
* @return
386+
* @param context context
387+
* @return boolean: true - succeed, false - failed.
388388
*/
389389
public static boolean isSupportOppoPush(Context context) {
390390
return cn.leancloud.oppo.LCMixPushManager.isSupportOppoPush(context);
@@ -406,11 +406,11 @@ public static void resumeOppoPush() {
406406

407407
/**
408408
* set oppo push time.
409-
* @param weekDays
410-
* @param startHour
411-
* @param startMinute
412-
* @param endHour
413-
* @param endMinute
409+
* @param weekDays week days
410+
* @param startHour start hour
411+
* @param startMinute start minute
412+
* @param endHour end hour
413+
* @param endMinute end minute
414414
*/
415415
public static void setOppoPushTime(List<Integer> weekDays, int startHour, int startMinute,
416416
int endHour, int endMinute) {
@@ -419,15 +419,15 @@ public static void setOppoPushTime(List<Integer> weekDays, int startHour, int st
419419

420420
/**
421421
* set oppo push aliases.
422-
* @param aliases
422+
* @param aliases alias list.
423423
*/
424424
public static void setOppoAliases(List<String> aliases) {
425425
cn.leancloud.oppo.LCMixPushManager.setOppoAliases(aliases);
426426
}
427427

428428
/**
429429
* unset oppo push aliases.
430-
* @param alias
430+
* @param alias alias
431431
*/
432432
public static void unsetOppoAlias(String alias) {
433433
cn.leancloud.oppo.LCMixPushManager.unsetOppoAlias(alias);
@@ -442,15 +442,15 @@ public static void getOppoAliases() {
442442

443443
/**
444444
* set oppo push account.
445-
* @param account
445+
* @param account oppo account
446446
*/
447447
public static void setOppoUserAccount(String account) {
448448
cn.leancloud.oppo.LCMixPushManager.setOppoUserAccount(account);
449449
}
450450

451451
/**
452452
* unset oppo push accounts.
453-
* @param accounts
453+
* @param accounts oppo account list.
454454
*/
455455
public static void unsetOppoUserAccouts(List<String> accounts) {
456456
cn.leancloud.oppo.LCMixPushManager.unsetOppoUserAccouts(accounts);
@@ -465,15 +465,15 @@ public static void getOppoUserAccounts() {
465465

466466
/**
467467
* set oppo push tags.
468-
* @param tags
468+
* @param tags tag list.
469469
*/
470470
public static void setOppoTags(List<String> tags) {
471471
cn.leancloud.oppo.LCMixPushManager.setOppoTags(tags);
472472
}
473473

474474
/**
475475
* unset oppo push tags.
476-
* @param tags
476+
* @param tags tag list.
477477
*/
478478
public static void unsetOppoTags(List<String> tags) {
479479
cn.leancloud.oppo.LCMixPushManager.unsetOppoTags(tags);

‎android-sdk/mixpush-hms/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ dependencies {
6363

6464
implementation 'com.huawei.hms:push:5.1.1.301'
6565

66-
implementation 'androidx.appcompat:appcompat:1.0.0'
6766
testImplementation 'junit:junit:4.12'
6867
androidTestImplementation 'androidx.test:runner:1.1.0'
6968
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'

‎android-sdk/mixpush-hms/src/main/java/cn/leancloud/LCHMSMessageService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public LCHMSMessageService() {
2424
/**
2525
* 收到透传消息
2626
*
27-
* @param remoteMessage
27+
* @param remoteMessage remote message
2828
*/
2929
@Override
3030
public void onMessageReceived(RemoteMessage remoteMessage) {
@@ -55,7 +55,7 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
5555
* 2、如果服务端识别token过期，服务端刷新token也会以onNewToken方式返回。
5656
* 3、华为设备上EMUI版本低于10.0申请token时，以onNewToken方式返回。
5757
*
58-
* @param token
58+
* @param token push token
5959
*/
6060
@Override
6161
public void onNewToken(String token) {
@@ -64,7 +64,7 @@ public void onNewToken(String token) {
6464

6565
/**
6666
* 申请token失败回调方法
67-
* @param exception
67+
* @param exception exception
6868
*/
6969
@Override
7070
public void onTokenError(Exception exception) {

‎android-sdk/mixpush-meizu/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ dependencies {
6262

6363
implementation 'com.meizu.flyme.internet:push-internal:3.6.2@aar'
6464

65-
implementation 'androidx.appcompat:appcompat:1.0.0'
6665
testImplementation 'junit:junit:4.12'
6766
androidTestImplementation 'androidx.test:runner:1.1.0'
6867
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'

‎android-sdk/mixpush-oppo/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ dependencies {
6060

6161
implementation("cn.leancloud:realtime-core:${rootProject.ext.sdkVersion}")
6262

63-
implementation 'androidx.appcompat:appcompat:1.0.0'
6463
testImplementation 'junit:junit:4.12'
6564
androidTestImplementation 'androidx.test:runner:1.1.0'
6665
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'

0 commit comments

Comments
 (0)