Skip to content

Commit 167cfd6

Browse files
committed
version bump
1 parent 5239b08 commit 167cfd6

File tree

7 files changed

+30
-15
lines changed

7 files changed

+30
-15
lines changed

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=5.0.1
18+
VERSION_NAME=5.0.3
1919
VERSION_CODE=2695
2020
GROUP=cn.leancloud
2121

android-sdk/leancloud-fcm/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ dependencies {
5050

5151
compile project(':realtime-android')
5252

53-
compile 'com.google.firebase:firebase-core:15.0.2'
54-
compile 'com.google.firebase:firebase-iid:15.0.2'
55-
compile 'com.google.firebase:firebase-messaging:15.0.2'
53+
implementation 'com.google.firebase:firebase-core:15.0.2'
54+
implementation 'com.google.firebase:firebase-iid:15.0.2'
55+
implementation 'com.google.firebase:firebase-messaging:15.0.2'
5656
implementation 'com.firebase:firebase-jobdispatcher:0.8.5'
5757

5858
implementation 'com.android.support:appcompat-v7:26.1.0'

android-sdk/mixpush-android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ dependencies {
5757
compile project(':realtime-android')
5858
compile project(':storage-android')
5959

60-
compile 'com.meizu.flyme.internet:push-internal:3.6.2@aar'
60+
implementation 'com.meizu.flyme.internet:push-internal:3.6.2@aar'
6161

6262
implementation 'com.android.support:appcompat-v7:26.1.0'
6363
testImplementation 'junit:junit:4.12'

android-sdk/realtime-android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ dependencies {
6565

6666
compile project(':storage-android')
6767

68-
compile('cn.leancloud:realtime-core:5.0.3')
69-
compile 'com.android.support:support-v4:26.1.0'
68+
implementation('cn.leancloud:realtime-core:5.0.4')
69+
implementation 'com.android.support:support-v4:26.1.0'
7070

7171
testImplementation 'junit:junit:4.12'
7272
androidTestImplementation 'com.android.support.test:runner:1.0.2'

android-sdk/storage-android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ dependencies {
7070

7171
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
7272

73-
compile('cn.leancloud:storage-core:5.0.3') {
73+
implementation('cn.leancloud:storage-core:5.0.4') {
7474
exclude group: 'com.alibaba', module: 'fastjson'
7575
exclude group: 'org.ligboy.retrofit2', module: 'converter-fastjson'
7676
}
7777
implementation 'com.alibaba:fastjson:1.1.70.android'
78-
compile 'org.ligboy.retrofit2:converter-fastjson-android:2.1.0'
78+
implementation 'org.ligboy.retrofit2:converter-fastjson-android:2.1.0'
7979

8080
testImplementation 'junit:junit:4.12'
8181
testImplementation "org.mockito:mockito-core:2.+"

android-sdk/storage-sample-app/build.gradle

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ android {
1111
versionCode 1
1212
versionName "1.0"
1313
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14+
multiDexEnabled true
1415
}
1516
buildTypes {
1617
release {
@@ -38,16 +39,22 @@ android {
3839
}
3940

4041
dependencies {
42+
implementation fileTree(include: ['*.jar'], dir: 'libs')
43+
44+
compile project(':storage-android')
4145

42-
implementation 'cn.leancloud:storage-android:5.0.2'
4346
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
47+
48+
implementation('cn.leancloud:storage-core:5.0.4') {
49+
exclude group: 'com.alibaba', module: 'fastjson'
50+
exclude group: 'org.ligboy.retrofit2', module: 'converter-fastjson'
51+
}
4452
implementation 'com.alibaba:fastjson:1.1.70.android'
53+
implementation 'org.ligboy.retrofit2:converter-fastjson-android:2.1.0'
4554

46-
implementation fileTree(dir: 'libs', include: ['*.jar'])
4755
implementation 'com.android.support:appcompat-v7:26.1.0'
4856
implementation 'com.android.support:design:26.1.0'
4957
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
50-
5158
testImplementation 'junit:junit:4.12'
5259
}
5360

android-sdk/storage-sample-app/src/main/java/cn/leancloud/sample/testcase/ObjectTransferDemoActivity.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,25 @@
55
import cn.leancloud.AVException;
66
import cn.leancloud.AVObject;
77
import cn.leancloud.AVParcelableObject;
8+
import cn.leancloud.AVQuery;
89
import cn.leancloud.sample.DemoBaseActivity;
10+
import cn.leancloud.sample.Student;
911

1012
/**
1113
* Created by fengjunwen on 2018/6/27.
1214
*/
1315

1416
public class ObjectTransferDemoActivity extends DemoBaseActivity {
1517
public void testTransferObject() throws AVException {
16-
AVObject student = new AVObject("Student");
17-
student.put("age", 12);
18-
student.put("name", "Mike");
18+
AVQuery q = new AVQuery("Student");
19+
q.addDescendingOrder("createdAt");
20+
AVObject student = q.getFirst();
21+
if (student == null) {
22+
student = new AVObject("Student");
23+
student.put("age", 12);
24+
student.put("name", "Mike");
25+
}
26+
1927
AVParcelableObject parcelableObject = new AVParcelableObject(student);
2028
Intent intent = new Intent(this, ObjectTransferTargetActivity.class);
2129
intent.putExtra("attached", parcelableObject);

0 commit comments

Comments
 (0)