From 3a6b130946276b9191ed05bc3069e9a0ad9cd7e2 Mon Sep 17 00:00:00 2001 From: jtsky <704167880@qq.com> Date: Fri, 10 Sep 2021 11:39:20 +0800 Subject: [PATCH] modify: [Android]-release v3.5.0 --- Android/README.md | 11 +++++++++-- Android/build.gradle | 20 ++++++++++---------- Android/config.gradle | 10 +++++----- Android/settings.gradle | 4 ++-- Doc/android-ReleaseNotes.md | 16 ++++++++++++++++ README.md | 2 +- README_EN.md | 2 +- 7 files changed, 44 insertions(+), 21 deletions(-) diff --git a/Android/README.md b/Android/README.md index e88cd913..34157d1c 100644 --- a/Android/README.md +++ b/Android/README.md @@ -3,8 +3,8 @@ ## DoKit Android 最新版本 **由于jcenter事件的影响，我们需要将DoKit For Android迁移到mavenCentral()，但是需要更改groupId.所以大家要注意一下，具体的更新信息如下：** -**lastversion:3.5.0-beta01；kotlin编译插件为1.4.32 ；支持Gradle 6.8及以上** -**lastversion:3.5.0.1-beta01； kotlin编译插件为1.3.72； 支持Gradle 6.8及以下** +**lastversion:3.5.0；kotlin编译插件为1.4.32 ；支持Gradle 6.8及以上** +**lastversion:3.5.0.1； kotlin编译插件为1.3.72； 支持Gradle 6.8及以下** |DoKit|最新版本|描述| |-|-|-| @@ -370,6 +370,13 @@ public class DoKit private constructor() { param: Map? = null ) { } + /** + * 获取一机多控类型 + */ + @JvmStatic + fun mcMode(): WSMode { + return WSMode.UNKNOW + } } diff --git a/Android/build.gradle b/Android/build.gradle index 6ba76a7b..e959210b 100644 --- a/Android/build.gradle +++ b/Android/build.gradle @@ -14,11 +14,11 @@ buildscript { maven { url "https://oss.sonatype.org/content/groups/public" } - maven { url 'https://artifactory.intra.xiaojukeji.com/artifactory/public' } - maven { - //本地插件地址 - url uri('/Users/didi/project/dokit_repo') - } +// maven { url 'https://artifactory.intra.xiaojukeji.com/artifactory/public' } +// maven { +// //本地插件地址 +// url uri('/Users/didi/project/dokit_repo') +// } } dependencies { classpath "com.android.tools.build:gradle:$gradlePluginVersion" @@ -44,11 +44,11 @@ allprojects { maven { url "https://oss.sonatype.org/content/groups/public" } - maven { url 'https://artifactory.intra.xiaojukeji.com/artifactory/public' } - maven { - //本地插件地址 - url uri('/Users/didi/project/dokit_repo') - } +// maven { url 'https://artifactory.intra.xiaojukeji.com/artifactory/public' } +// maven { +// //本地插件地址 +// url uri('/Users/didi/project/dokit_repo') +// } } } diff --git a/Android/config.gradle b/Android/config.gradle index b332652f..23374745 100755 --- a/Android/config.gradle +++ b/Android/config.gradle @@ -8,7 +8,7 @@ ext { //1:依赖dokit远程aar运行 run_type : 0, group_id : 'io.github.didi.dokit', - version : '3.4.3.109' + version : '3.5.0' ] android = [compileSdkVersion : 29, @@ -21,12 +21,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", agp_module_verson : "7.0.0", agp_plugin_verson : "4.2.2", diff --git a/Android/settings.gradle b/Android/settings.gradle index d1ab243d..0ca3d1f3 100644 --- a/Android/settings.gradle +++ b/Android/settings.gradle @@ -9,5 +9,5 @@ include ':dokit-okhttp-api' include ':dokit-weex' include ':dokit-no-op' include ':dokit-plugin' -include ':dokit-rpc' -include ':dokit-rpc-mc' +//include ':dokit-rpc' +//include ':dokit-rpc-mc' diff --git a/Doc/android-ReleaseNotes.md b/Doc/android-ReleaseNotes.md index 15e4ad35..13b1213f 100644 --- a/Doc/android-ReleaseNotes.md +++ b/Doc/android-ReleaseNotes.md @@ -1,5 +1,21 @@ DoraemonKit-Android releases === + +## 3.5.0.1 + +1、bug fixed + +2、DoKit For Android Kotlin 编译插件版本为1.3.72，支持Gradle 6.8及以下版本 + +3、相关功能对应3.5.0 + +## 3.5.0 + +1、bug fixed + +2、DoKit For Android Kotlin 编译插件版本为1.4.32，支持Gradle 6.8及以上版本 + + ## 3.5.0.1-beta01 1、Support AGP 7.0 diff --git a/README.md b/README.md index 82665a43..8af07dcf 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@
DoraemonKit - + diff --git a/README_EN.md b/README_EN.md index 194ca048..073a7fa0 100644 --- a/README_EN.md +++ b/README_EN.md @@ -1,7 +1,7 @@
DoraemonKit - +
-- GitLab