see 07/20 log

Author: Blankj

buildSrc/src/main/groovy/Config.groovy

@@ -38,11 +38,11 @@ class Config {
                     // 本地第一次上传插件新的版本需设置 useLocal = true, isApply = false
                     // 本地上传成功之后 isApply = true 即可应用插件来调试，后续版本更新无需设置 isApply = false
                     // 发布版本的话把 useLocal = false, isApply = false，发布成功后 isApply = true 即可使用远程库版本
-                    api    : new DepConfig(true/*是否本地调试*/, "com.blankj:api-gradle-plugin:1.0", true/*是否使用插件*/),
+                    api    : new DepConfig(false/*是否本地调试*/, "com.blankj:api-gradle-plugin:1.0", true/*是否使用插件*/),
                     bus    : new DepConfig(false/*是否本地调试*/, "com.blankj:bus-gradle-plugin:2.0", true/*是否使用插件*/),
             ],
 
-            api_gradle_plugin: new DepConfig(":plugin:api-gradle-plugin", true),
+            api_gradle_plugin: new DepConfig(":plugin:api-gradle-plugin", false),
             bus_gradle_plugin: new DepConfig(":plugin:bus-gradle-plugin", false),
 
             feature          : [

feature/mock/src/main/java/com/blankj/mock/api/SubUtilMockApi.java renamed to feature/mock/src/main/java/com/blankj/mock/subutil/SubUtilApiMock.java

@@ -1,4 +1,4 @@
-package com.blankj.mock.api;
+package com.blankj.mock.subutil;
 
 import android.content.Context;
 
@@ -15,7 +15,7 @@
  * </pre>
  */
 @ApiUtils.Api(isMock = true)
-public class SubUtilMockApi extends SubUtilApi {
+public class SubUtilApiMock extends SubUtilApi {
 
     @Override
     public void startSubUtilActivity(Context context) {

feature/mock/src/main/java/com/blankj/mock/api/UtilCodeMockApi.java renamed to feature/mock/src/main/java/com/blankj/mock/utilcode/UtilCodeApiMock.java

@@ -1,4 +1,4 @@
-package com.blankj.mock.api;
+package com.blankj.mock.utilcode;
 
 import android.content.Context;
 
@@ -15,7 +15,7 @@
  * </pre>
  */
 @ApiUtils.Api(isMock = true)
-public class UtilCodeMockApi extends UtilCodeApi {
+public class UtilCodeApiMock extends UtilCodeApi {
 
     @Override
     public void startUtilCodeActivity(Context context) {

plugin/api-gradle-plugin/README.md

@@ -243,8 +243,13 @@ public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
 public void visitEnd() {
     super.visitEnd();
     if (hasAnnotation) {
-        if (!isMock) {// 如果不是 mock 的话，那么直接写入
-            mApiImplMap.put(superClassName, new ApiInfo(className, false));
+        if (!isMock) {// 如果不是 mock 的话
+            ApiInfo apiInfo = mApiImplMap.get(superClassName);
+            if (apiInfo == null) {
+                mApiImplMap.put(superClassName, new ApiInfo(className, false));
+            } else {// 存在一个 api 多个实现就报错
+                errorStr = "<" + className + "> and <" + apiInfo.implApiClass + "> impl same api of <" + superClassName + ">";
+            }
         } else {// mock 的话，如果 map 中已存在就不覆盖了
             if (!mApiImplMap.containsKey(superClassName)) {
                 mApiImplMap.put(superClassName, new ApiInfo(className, true));

plugin/api-gradle-plugin/src/main/java/com/blankj/api/ApiClassVisitor.java

@@ -25,6 +25,7 @@ public class ApiClassVisitor extends ClassVisitor {
     private boolean              hasAnnotation;
     private boolean              isMock;
     private String               mApiUtilsClass;
+    public  String               errorStr;
 
     public ApiClassVisitor(ClassVisitor classVisitor, Map<String, ApiInfo> apiImplMap, List<String> apiClasses, String apiUtilsClass) {
         super(Opcodes.ASM5, classVisitor);
@@ -62,8 +63,13 @@ public void visit(String name, Object value) {// 可获取注解的值
     public void visitEnd() {
         super.visitEnd();
         if (hasAnnotation) {
-            if (!isMock) {// 如果不是 mock 的话，那么直接写入
-                mApiImplMap.put(superClassName, new ApiInfo(className, false));
+            if (!isMock) {// 如果不是 mock 的话
+                ApiInfo apiInfo = mApiImplMap.get(superClassName);
+                if (apiInfo == null) {
+                    mApiImplMap.put(superClassName, new ApiInfo(className, false));
+                } else {// 存在一个 api 多个实现就报错
+                    errorStr = "<" + className + "> and <" + apiInfo.implApiClass + "> impl same api of <" + superClassName + ">";
+                }
             } else {// mock 的话，如果 map 中已存在就不覆盖了
                 if (!mApiImplMap.containsKey(superClassName)) {
                     mApiImplMap.put(superClassName, new ApiInfo(className, true));

plugin/api-gradle-plugin/src/main/java/com/blankj/api/ApiScan.groovy

@@ -64,7 +64,9 @@ class ApiScan {
             ClassVisitor cv = new ApiClassVisitor(cw, apiImplMap, apiClasses, apiUtilsClass);
             cr.accept(cv, ClassReader.SKIP_FRAMES);
 
-            FileUtils.writeByteArrayToFile(file, cw.toByteArray());
+            if (cv.errorStr != null) {
+                throw new Exception(cv.errorStr)
+            }
         }
     }
 }

plugin/bus-gradle-plugin/src/main/java/com/blankj/bus/BusScan.groovy

@@ -61,8 +61,6 @@ class BusScan {
             ClassWriter cw = new ClassWriter(cr, 0);
             ClassVisitor cv = new BusClassVisitor(cw, busMap, busUtilsClass);
             cr.accept(cv, ClassReader.SKIP_FRAMES);
-
-            FileUtils.writeByteArrayToFile(file, cw.toByteArray());
         }
     }
 }