Merge pull request Meituan-Dianping#112 from Meituan-Dianping/develop

Develop
3shao · May 5, 2017 · 3c00835 · 3c00835
2 parents 37816d0 + a9c7e6d
commit 3c00835
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -6,7 +6,7 @@
 
 手机系统版本：如:Android 5.0 (如是编译异常，则可以不填)
 
-Robust版本：如:0.3.7
+Robust版本：如:0.3.8
 
 Gradle版本：如:2.10
 

diff --git a/README-zh.md b/README-zh.md
@@ -26,7 +26,7 @@
 	apply plugin: 'robust'
 		
 		
-	compile 'com.meituan.robust:robust:0.3.7'
+	compile 'com.meituan.robust:robust:0.3.8'
 		
 	```
  2. 在整个项目的build.gradle加入classpath
@@ -37,8 +37,8 @@
 	        jcenter()
 	    }
 	    dependencies {
-	         classpath 'com.meituan.robust:gradle-plugin:0.3.7'
-	         classpath 'com.meituan.robust:auto-patch-plugin:0.3.7'
+	         classpath 'com.meituan.robust:gradle-plugin:0.3.8'
+	         classpath 'com.meituan.robust:auto-patch-plugin:0.3.8'
 	   }
 	}
 	```

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Robust is an Android HotFix solution with high compatibility and high stability.
 	//please uncomment fellow line before you build a patch
 	//apply plugin: 'auto-patch-plugin'
 	apply plugin: 'robust'
-	compile 'com.meituan.robust:robust:0.3.7'
+	compile 'com.meituan.robust:robust:0.3.8'
 	```
 2. Add below codes in the outest project's build.gradle file.
 
@@ -34,8 +34,8 @@ Robust is an Android HotFix solution with high compatibility and high stability.
 	        jcenter()
 	    }
 	    dependencies {
-	         classpath 'com.meituan.robust:gradle-plugin:0.3.7'
-	         classpath 'com.meituan.robust:auto-patch-plugin:0.3.7'
+	         classpath 'com.meituan.robust:gradle-plugin:0.3.8'
+	         classpath 'com.meituan.robust:auto-patch-plugin:0.3.8'
 	   }
 	}
 	```

diff --git a/app/src/main/java/com/meituan/sample/MainActivity.java b/app/src/main/java/com/meituan/sample/MainActivity.java
@@ -9,7 +9,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.meituan.sample.robusttest.other.Hll;
 import com.meituan.robust.Patch;
 import com.meituan.robust.PatchExecutor;
 import com.meituan.robust.RobustCallBack;
@@ -18,6 +17,9 @@
 import com.meituan.sample.robusttest.SampleClass;
 import com.meituan.sample.robusttest.State;
 import com.meituan.sample.robusttest.Super;
+import com.meituan.sample.robusttest.other.Hll;
+
+import java.util.List;
 
 /**
  *
@@ -98,7 +100,7 @@ public void onClick(View v) {
     class Callback implements RobustCallBack {
 
         @Override
-        public void onPatchListFetched(boolean result, boolean isNet) {
+        public void onPatchListFetched(boolean result, boolean isNet, List<Patch> patches) {
              System.out.println(" robust arrived in onPatchListFetched");
         }
 

diff --git a/build.gradle b/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         classpath 'com.android.tools.build:gradle:2.1.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath 'com.meituan.robust:gradle-plugin:0.3.4'
-        classpath 'com.meituan.robust:auto-patch-plugin:0.3.4'
+        classpath 'com.meituan.robust:gradle-plugin:0.3.8'
+        classpath 'com.meituan.robust:auto-patch-plugin:0.3.8'
         classpath 'me.tatarka:gradle-retrolambda:3.2.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'

diff --git a/gradle.properties b/gradle.properties
@@ -16,6 +16,6 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=0.3.7
+VERSION_NAME=0.3.8
 GROUP=com.meituan.robust
 
diff --git a/patch/src/main/java/com/meituan/robust/RobustCallBack.java b/patch/src/main/java/com/meituan/robust/RobustCallBack.java
@@ -1,5 +1,7 @@
 package com.meituan.robust;
 
+import java.util.List;
+
 /**
  * Created by hedex on 17/1/22.
  */
@@ -11,7 +13,7 @@ public interface RobustCallBack {
      * @param result 补丁
      * @param isNet  补丁
      */
-    void onPatchListFetched(boolean result, boolean isNet);
+    void onPatchListFetched(boolean result, boolean isNet, List<Patch> patches);
 
 
     /**