modify

[android]:优化打包方案

Android/java/app/build.gradle

@@ -86,7 +86,7 @@ dokitExt {
         //大图开关
         bigImgSwitch true
         //webView js 抓包
-        webViewSwitch true
+        //webViewSwitch true
     }
 
     slowMethod {
@@ -97,7 +97,7 @@ dokitExt {
             //调用栈函数入口
             enterMethods = ["com.didichuxing.doraemondemo.MainDebugActivity.test1"]
             //黑名单 粒度最小到类 暂不支持到方法
-            methodBlacklist = ["com.facebook.drawee.backends.pipeline.Fresco"]
+            //methodBlacklist = ["com.facebook.drawee.backends.pipeline.Fresco"]
         }
         //普通模式配置
         normalMethod {

Android/java/app/doraemonkit.gradle

 if (rootProject.ext.config["runType"] == 0) {
 // 引用插件
-    apply plugin: 'com.didi.dokit.debug'
-    //apply plugin: 'com.didi.dokit'
+    //apply plugin: 'com.didi.dokit.debug'
+    apply plugin: 'com.didi.dokit'
     // 这里引用正常库
     dependencies {
         //外部平台依赖

Android/java/build.gradle

@@ -4,17 +4,17 @@ buildscript {
     repositories {
         google()
         jcenter()
-//        maven { url 'http://artifactory.intra.xiaojukeji.com/artifactory/public' }
-        maven {
-            //本地插件地址
-            url uri(rootProject.ext.config["localRepoURL"])
-        }
+//        maven {
+//            //本地插件地址
+//            url uri(rootProject.ext.config["localRepoURL"])
+//        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'com.novoda:bintray-release:0.9.2'
 //        classpath "com.didichuxing.doraemonkit:doraemonkit-plugin:${rootProject.ext.android["pluginVersionName"]}"
-        classpath "com.didichuxing.doraemonkit:dokitx-plugin:3.3.0"
+        classpath "com.didichuxing.doraemonkit:doraemonkit-plugin:3.2.0"
+        //classpath "com.didichuxing.doraemonkit:dokitx-plugin:3.3.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.ext.android["kotlin_version"]}"
     }
 }
@@ -24,10 +24,10 @@ allprojects {
         google()
         jcenter()
 //        maven { url 'http://artifactory.intra.xiaojukeji.com/artifactory/public' }
-        maven {
-            //本地插件地址
-            url uri(rootProject.ext.config["localRepoURL"])
-        }
+//        maven {
+//            //本地插件地址
+//            url uri(rootProject.ext.config["localRepoURL"])
+//        }
     }
 }
 
@@ -38,6 +38,8 @@ task clean(type: Delete) {
 //解决打包时由于javadocRelease校验引起的打包失败
 //tasks.getByPath(":doraemonkit:javadocRelease").enabled = false
 //tasks.getByPath(":doraemonkit-no-op:javadocRelease").enabled = false
-//tasks.getByPath(":doraemonkit-leakcanary:javadocRelease").enabled = false
 //tasks.getByPath(":doraemonkit-weex:javadocRelease").enabled = false
 //tasks.getByPath(":doraemonkit-rpc:javadocRelease").enabled = false
+//tasks.getByPath(":doraemonkit-okhttp-v4:javadocRelease").enabled = false
+//tasks.getByPath(":doraemonkit-okhttp-v3:javadocRelease").enabled = false
+//tasks.getByPath(":doraemonkit-okhttp-api:javadocRelease").enabled = false

Android/java/config.gradle

@@ -5,7 +5,7 @@ ext {
             runOrPublish       : 0,
             //0:依赖dokit本地module运行
             //1:依赖dokit远程aar运行
-            runType            : 1,
+            runType            : 0,
             //0:发布到到本地localRepoURL仓库
             //1:发布到滴滴内部仓库 一般不建议使用 如果需要发布到滴滴内网仓库需要将版本号改得比较大 假如版本号跟jcenter上的一致会由于缓存导致没法下载最新的jcenter的线上代码
             //2:发布到jcenter远程仓库
@@ -31,7 +31,7 @@ ext {
                booster_version           : "2.3.0",
                okhttp_v2                 : "2.7.5",
                okhttp_v3                 : "3.14.7",
-               okhttp_v4                 : "4.9.0"
+               okhttp_v4                 : "4.7.0"
     ]
     dependencies = [// ###### android library  start ######
                     "multidex"           : 'androidx.multidex:multidex:2.0.0',

Android/java/doraemonkit-no-op/upload-release.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.novoda.bintray-release'
 // 配置发布 # script
 publish {
     def groupProjectID = 'com.didichuxing.doraemonkit'
-    def artifactProjectID = 'dokit-no-op'
+    def artifactProjectID = 'dokitx-no-op'
     def publishVersionID = "${rootProject.ext.android["jcenterArchivesVersionName"]}"
 
     userOrg = 'doraemonkit'

Android/java/doraemonkit-plugin/build.gradle

@@ -27,7 +27,7 @@ dependencies {
     compileOnly gradleApi()
     compileOnly localGroovy()
     //版本不能太高 否则会跟项目的as版本冲突
-    compileOnly 'com.android.tools.build:gradle:4.0.2'
+    compileOnly 'com.android.tools.build:gradle:3.5.3'
     /* 👇👇👇👇 引用这两个模块 👇👇👇👇 */
     api "com.didiglobal.booster:booster-api:${rootProject.ext.android["booster_version"]}"
     api "com.didiglobal.booster:booster-transform-asm:${rootProject.ext.android["booster_version"]}"

Android/java/doraemonkit-weex/upload-release.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.novoda.bintray-release'
 // 配置发布 # script
 publish {
     def groupProjectID = 'com.didichuxing.doraemonkit'
-    def artifactProjectID = 'doraemonkit-weex'
+    def artifactProjectID = 'dokitx-weex'
     def publishVersionID = "${rootProject.ext.android["jcenterArchivesVersionName"]}"
 
     userOrg = 'doraemonkit'

Android/java/empey-app/build.gradle

@@ -28,4 +28,6 @@ dependencies {
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation "com.didichuxing.doraemonkit:dokitx-okhttp-v3:${rootProject.ext.android["jcenterArchivesVersionName"]}"
+    implementation "com.didichuxing.doraemonkit:dokitx-okhttp-v4:${rootProject.ext.android["jcenterArchivesVersionName"]}"
 }
\ No newline at end of file

Android/java/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip