Skip to content

Commit 3c00835

Browse files
authored
Merge pull request #112 from Meituan-Dianping/develop
Develop
2 parents 37816d0 + a9c7e6d commit 3c00835

7 files changed

Lines changed: 17 additions & 13 deletions

File tree

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
手机系统版本:如:Android 5.0 (如是编译异常,则可以不填)
88

9-
Robust版本:如:0.3.7
9+
Robust版本:如:0.3.8
1010

1111
Gradle版本:如:2.10
1212

README-zh.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
apply plugin: 'robust'
2727
2828
29-
compile 'com.meituan.robust:robust:0.3.7'
29+
compile 'com.meituan.robust:robust:0.3.8'
3030
3131
```
3232
2. 在整个项目的build.gradle加入classpath
@@ -37,8 +37,8 @@
3737
jcenter()
3838
}
3939
dependencies {
40-
classpath 'com.meituan.robust:gradle-plugin:0.3.7'
41-
classpath 'com.meituan.robust:auto-patch-plugin:0.3.7'
40+
classpath 'com.meituan.robust:gradle-plugin:0.3.8'
41+
classpath 'com.meituan.robust:auto-patch-plugin:0.3.8'
4242
}
4343
}
4444
```

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Robust is an Android HotFix solution with high compatibility and high stability.
2424
//please uncomment fellow line before you build a patch
2525
//apply plugin: 'auto-patch-plugin'
2626
apply plugin: 'robust'
27-
compile 'com.meituan.robust:robust:0.3.7'
27+
compile 'com.meituan.robust:robust:0.3.8'
2828
```
2929
2. Add below codes in the outest project's build.gradle file.
3030

@@ -34,8 +34,8 @@ Robust is an Android HotFix solution with high compatibility and high stability.
3434
jcenter()
3535
}
3636
dependencies {
37-
classpath 'com.meituan.robust:gradle-plugin:0.3.7'
38-
classpath 'com.meituan.robust:auto-patch-plugin:0.3.7'
37+
classpath 'com.meituan.robust:gradle-plugin:0.3.8'
38+
classpath 'com.meituan.robust:auto-patch-plugin:0.3.8'
3939
}
4040
}
4141
```

app/src/main/java/com/meituan/sample/MainActivity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import android.widget.TextView;
1010
import android.widget.Toast;
1111

12-
import com.meituan.sample.robusttest.other.Hll;
1312
import com.meituan.robust.Patch;
1413
import com.meituan.robust.PatchExecutor;
1514
import com.meituan.robust.RobustCallBack;
@@ -18,6 +17,9 @@
1817
import com.meituan.sample.robusttest.SampleClass;
1918
import com.meituan.sample.robusttest.State;
2019
import com.meituan.sample.robusttest.Super;
20+
import com.meituan.sample.robusttest.other.Hll;
21+
22+
import java.util.List;
2123

2224
/**
2325
*
@@ -98,7 +100,7 @@ public void onClick(View v) {
98100
class Callback implements RobustCallBack {
99101

100102
@Override
101-
public void onPatchListFetched(boolean result, boolean isNet) {
103+
public void onPatchListFetched(boolean result, boolean isNet, List<Patch> patches) {
102104
System.out.println(" robust arrived in onPatchListFetched");
103105
}
104106

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ buildscript {
99
classpath 'com.android.tools.build:gradle:2.1.0'
1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
12-
classpath 'com.meituan.robust:gradle-plugin:0.3.4'
13-
classpath 'com.meituan.robust:auto-patch-plugin:0.3.4'
12+
classpath 'com.meituan.robust:gradle-plugin:0.3.8'
13+
classpath 'com.meituan.robust:auto-patch-plugin:0.3.8'
1414
classpath 'me.tatarka:gradle-retrolambda:3.2.0'
1515
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
1616
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19-
VERSION_NAME=0.3.7
19+
VERSION_NAME=0.3.8
2020
GROUP=com.meituan.robust
2121

patch/src/main/java/com/meituan/robust/RobustCallBack.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.meituan.robust;
22

3+
import java.util.List;
4+
35
/**
46
* Created by hedex on 17/1/22.
57
*/
@@ -11,7 +13,7 @@ public interface RobustCallBack {
1113
* @param result 补丁
1214
* @param isNet 补丁
1315
*/
14-
void onPatchListFetched(boolean result, boolean isNet);
16+
void onPatchListFetched(boolean result, boolean isNet, List<Patch> patches);
1517

1618

1719
/**

0 commit comments

Comments
 (0)