Merge branch 'master' of github.com:didi/DoraemonKit

ChandraGillellamudi · May 18, 2020 · eda0775 · eda0775
2 parents 32c8d83 + d85ed11
commit eda0775
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/Android/build.gradle b/Android/build.gradle
@@ -28,8 +28,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: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
diff --git a/Android/settings.gradle b/Android/settings.gradle
@@ -1,6 +1,6 @@
 include ':app'
 include ':doraemonkit'
-include ':doraemonkit-rpc'
+//include ':doraemonkit-rpc'
 include ':doraemonkit-no-op'
 include ':doraemonkit-weex'
 include ':doraemonkit-leakcanary'

diff --git a/Doc/android-ReleaseNotes.md b/Doc/android-ReleaseNotes.md
@@ -1,5 +1,9 @@
 DoraemonKit-Android releases
 ===
+## 3.0.6
+1.对齐androidx dokit v3.1.5 版本功能
+
+
 ## 3.1.5
 1.更加精细化的插件控制(具体的插件配置信息可参考www.dokit.cn Android接入指南)
 

diff --git a/Doc/android_cn_guide.md b/Doc/android_cn_guide.md
@@ -3,7 +3,7 @@
 |DoKit|最新版本|描述|
 |-|-|-|
 |支持Androidx|3.1.5|从v3.1.0版本开始支持androidx|
-|支持android support|3.0.5|3.0.5版本对应3.1.3的功能，同时该版本为支持Android support的最后一个版本，后期也将不在提供维护，请大家尽快升级和适配Androidx|
+|支持android support|3.0.6|3.0.6版本对应3.1.5的功能，后期support将会不定期更新，主要还是看社区的反馈，请大家尽快升级和适配Androidx|
 
 
 #### 1. Gradle 依赖

diff --git a/Doc/android_en_guide.md b/Doc/android_en_guide.md
@@ -3,7 +3,7 @@
 |DoKit|new Version|Desc|
 |-    |-      |-  |
 |support Androidx|3.1.5|support Androidx from v3.1.0|
-|supprot android support|3.0.3|For support Android support, one or two versions will be maintained, please hug Androidx as soon as possible|
+|supprot android support|3.0.6|Version 3.0.6 corresponds to the function of 3.1.5. Later support will be updated from time to time, mainly based on community feedback, please upgrade and adapt to Androidx as soon as possible|
 
 
 #### 1. DoKit SDK Dependencie