modify:

[Android]-适配agp7.0

Android/build.gradle

@@ -93,10 +93,10 @@ task copyPluginSource(type: Copy, dependsOn: deleteSource) {
 /**
  * 打包上传配置检查
  */
-task checkUploadConfig() {
+task checkUploadConfig4Maven() {
     doLast {
         if (rootProject.ext.publish_config["archives_type"] != 2) {
-            throw new RuntimeException("执行打包上传任务必须修改config.gradle配置中的archives_type = 2。")
+            throw new RuntimeException("执行当前打包上传任务必须修改config.gradle配置中的archives_type = 2。")
         }
         try {
             rootProject.project("dokit-rpc").name
@@ -115,10 +115,31 @@ task checkUploadConfig() {
     }
 }
 
-task checkLocalUploadConfig() {
+task checkUploadConfig4Local() {
     doLast {
-        if (rootProject.ext.publish_config["archives_type"] == 2) {
-            throw new RuntimeException("执行打包上传任务必须修改config.gradle配置中的archives_type = 1或者2。")
+        if (rootProject.ext.publish_config["archives_type"] != 0) {
+            throw new RuntimeException("执行当前打包上传任务必须修改config.gradle配置中的archives_type = 0。")
+        }
+        try {
+            rootProject.project("dokit-rpc").name
+            rootProject.project("dokit-rpc-mc").name
+        } catch (Exception e) {
+            throw new RuntimeException("dokit rpc 相关模块未开启动。。。")
+        }
+
+        try {
+            rootProject.project("dokit-plugin").name
+        } catch (Exception e) {
+            throw new RuntimeException("dokit plugn 模块未开启动。。。")
+        }
+
+    }
+}
+
+task checkUploadConfig4Didi() {
+    doLast {
+        if (rootProject.ext.publish_config["archives_type"] != 1) {
+            throw new RuntimeException("执行当前打包上传任务必须修改config.gradle配置中的archives_type = 1。")
         }
         try {
             rootProject.project("dokit-rpc").name

Android/config.gradle

@@ -10,7 +10,7 @@ ext {
 //            group_id     : 'com.didichuxing.doraemonkit',
             group_id     : 'io.github.didi.dokit',
 //            version      : '3.4.0-SNAPSHOT'
-            version      : '3.4.3.105'
+            version      : '3.5.0'
     ]
 
     android = [compileSdkVersion            : 29,
@@ -23,12 +23,12 @@ ext {
                versionCode                  : 1,
                versionName                  : "1.0.0",
                glide_version                : "4.9.0",
-               kotlin_version               : "1.3.72",
+//               kotlin_version               : "1.3.72",
 //           kotlin_version               : "1.4.20",
-//               kotlin_version               : "1.4.32",
-               kotlinx_coroutines_version   : "1.3.7",
+               kotlin_version               : "1.4.32",
+//               kotlinx_coroutines_version   : "1.3.7",
 //               kotlinx_coroutines_version   : "1.4.2",
-//               kotlinx_coroutines_version   : "1.4.3",
+               kotlinx_coroutines_version   : "1.4.3",
                booster_version              : "4.0.0",
                jcenter_gradle_plugin_version: "3.5.3",
                agp_module_verson            : "7.0.0",

Android/dokit/src/main/java/com/didichuxing/doraemonkit/kit/timecounter/AppStartInfoFragment.java

@@ -59,11 +59,13 @@ public class AppStartInfoFragment extends BaseFragment {
 
         mInfo = findViewById(R.id.app_start_info);
         StringBuilder builder = new StringBuilder();
-        if (TextUtils.isEmpty(MethodStackUtil.STR_APP_ATTACH_BASECONTEXT)) {
+        if (TextUtils.isEmpty(MethodStackUtil.STR_APP_ON_CREATE) && TextUtils.isEmpty(MethodStackUtil.STR_APP_ATTACH_BASECONTEXT)) {
             builder.append("只有配置slowMethod的strategy=0模式下才能统计到启动函数调用栈");
         } else {
-            builder.append(MethodStackUtil.STR_APP_ATTACH_BASECONTEXT);
-            builder.append("\n");
+            if(!TextUtils.isEmpty(MethodStackUtil.STR_APP_ATTACH_BASECONTEXT)){
+                builder.append(MethodStackUtil.STR_APP_ATTACH_BASECONTEXT);
+                builder.append("\n");
+            }
             builder.append(MethodStackUtil.STR_APP_ON_CREATE);
         }
 

Android/upload_didi.sh

+#!/bin/bash
+
+./gradlew checkUploadConfig4Didi || ! echo "执行当前打包上传任务必须修改config.gradle配置中的archives_type = 1" || exit
+./gradlew copyPluginSource
+./gradlew clean
+./gradlew :dokit-plugin:assemble
+./gradlew assembleRelease
+./gradlew :dokit:publish
+./gradlew :dokit-ft:publish
+./gradlew :dokit-mc:publish
+./gradlew :dokit-no-op:publish
+./gradlew :dokit-okhttp-api:publish
+./gradlew :dokit-okhttp-v3:publish
+./gradlew :dokit-okhttp-v4:publish
+./gradlew :dokit-plugin:publish
+./gradlew :dokit-rpc:publish
+./gradlew :dokit-rpc-mc:publish
+./gradlew :dokit-util:publish
+./gradlew :dokit-weex:publish
+echo "打包上传到滴滴内部仓库完成！！！"
\ No newline at end of file

Android/upload_local.sh

 #!/bin/bash
 
+./gradlew checkUploadConfig4Local || ! echo "执行当前打包上传任务必须修改config.gradle配置中的archives_type = 0" || exit
 ./gradlew copyPluginSource
 ./gradlew :dokit-plugin:assemble
 ./gradlew assembleRelease
@@ -14,4 +15,5 @@
 ./gradlew :dokit-rpc:publish
 ./gradlew :dokit-rpc-mc:publish
 ./gradlew :dokit-util:publish
-./gradlew :dokit-weex:publish
\ No newline at end of file
+./gradlew :dokit-weex:publish
+echo "本地打包完成！！！"
\ No newline at end of file

Android/upload.sh → Android/upload_maven.sh

 #!/bin/bash
 
+./gradlew checkUploadConfig4Maven || ! echo "执行当前打包上传任务必须修改config.gradle配置中的archives_type = 2" || exit
 ./gradlew copyPluginSource
+./gradlew clean
 ./gradlew :dokit-plugin:assemble
 ./gradlew assembleRelease
 ./gradlew :dokit:publishReleasePublicationToMavenCentralRepository
@@ -14,4 +16,5 @@
 ./gradlew :dokit-rpc:publishReleasePublicationToMavenCentralRepository
 ./gradlew :dokit-rpc-mc:publishReleasePublicationToMavenCentralRepository
 ./gradlew :dokit-util:publishReleasePublicationToMavenCentralRepository
-./gradlew :dokit-weex:publishReleasePublicationToMavenCentralRepository
\ No newline at end of file
+./gradlew :dokit-weex:publishReleasePublicationToMavenCentralRepository
+echo "打包上传到MavenCenter()仓库完成！！！"
\ No newline at end of file