Skip to content

Commit 3a6b130

Browse files
committed
modify:
[Android]-release v3.5.0
1 parent 21811d8 commit 3a6b130

7 files changed

Lines changed: 44 additions & 21 deletions

File tree

Android/README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
## DoKit Android 最新版本
44
**由于jcenter事件的影响,我们需要将DoKit For Android迁移到mavenCentral(),但是需要更改groupId.所以大家要注意一下,具体的更新信息如下:**
55

6-
**lastversion:3.5.0-beta01;kotlin编译插件为1.4.32 ;支持Gradle 6.8及以上**
7-
**lastversion:3.5.0.1-beta01; kotlin编译插件为1.3.72; 支持Gradle 6.8及以下**
6+
**lastversion:3.5.0;kotlin编译插件为1.4.32 ;支持Gradle 6.8及以上**
7+
**lastversion:3.5.0.1; kotlin编译插件为1.3.72; 支持Gradle 6.8及以下**
88

99
|DoKit|最新版本|描述|
1010
|-|-|-|
@@ -370,6 +370,13 @@ public class DoKit private constructor() {
370370
param: Map<String, String>? = null
371371
) {
372372
}
373+
/**
374+
* 获取一机多控类型
375+
*/
376+
@JvmStatic
377+
fun mcMode(): WSMode {
378+
return WSMode.UNKNOW
379+
}
373380
}
374381

375382

Android/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ buildscript {
1414
maven {
1515
url "https://oss.sonatype.org/content/groups/public"
1616
}
17-
maven { url 'https://artifactory.intra.xiaojukeji.com/artifactory/public' }
18-
maven {
19-
//本地插件地址
20-
url uri('/Users/didi/project/dokit_repo')
21-
}
17+
// maven { url 'https://artifactory.intra.xiaojukeji.com/artifactory/public' }
18+
// maven {
19+
// //本地插件地址
20+
// url uri('/Users/didi/project/dokit_repo')
21+
// }
2222
}
2323
dependencies {
2424
classpath "com.android.tools.build:gradle:$gradlePluginVersion"
@@ -44,11 +44,11 @@ allprojects {
4444
maven {
4545
url "https://oss.sonatype.org/content/groups/public"
4646
}
47-
maven { url 'https://artifactory.intra.xiaojukeji.com/artifactory/public' }
48-
maven {
49-
//本地插件地址
50-
url uri('/Users/didi/project/dokit_repo')
51-
}
47+
// maven { url 'https://artifactory.intra.xiaojukeji.com/artifactory/public' }
48+
// maven {
49+
// //本地插件地址
50+
// url uri('/Users/didi/project/dokit_repo')
51+
// }
5252
}
5353
}
5454

Android/config.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ext {
88
//1:依赖dokit远程aar运行
99
run_type : 0,
1010
group_id : 'io.github.didi.dokit',
11-
version : '3.4.3.109'
11+
version : '3.5.0'
1212
]
1313

1414
android = [compileSdkVersion : 29,
@@ -21,12 +21,12 @@ ext {
2121
versionCode : 1,
2222
versionName : "1.0.0",
2323
glide_version : "4.9.0",
24-
kotlin_version : "1.3.72",
24+
// kotlin_version : "1.3.72",
2525
// kotlin_version : "1.4.20",
26-
// kotlin_version : "1.4.32",
27-
kotlinx_coroutines_version: "1.3.7",
26+
kotlin_version : "1.4.32",
27+
// kotlinx_coroutines_version: "1.3.7",
2828
// kotlinx_coroutines_version : "1.4.2",
29-
// kotlinx_coroutines_version : "1.4.3",
29+
kotlinx_coroutines_version : "1.4.3",
3030
booster_version : "4.0.0",
3131
agp_module_verson : "7.0.0",
3232
agp_plugin_verson : "4.2.2",

Android/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ include ':dokit-okhttp-api'
99
include ':dokit-weex'
1010
include ':dokit-no-op'
1111
include ':dokit-plugin'
12-
include ':dokit-rpc'
13-
include ':dokit-rpc-mc'
12+
//include ':dokit-rpc'
13+
//include ':dokit-rpc-mc'

Doc/android-ReleaseNotes.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
DoraemonKit-Android releases
22
===
3+
4+
## 3.5.0.1
5+
6+
1、bug fixed
7+
8+
2、DoKit For Android Kotlin 编译插件版本为1.3.72,支持Gradle 6.8及以下版本
9+
10+
3、相关功能对应3.5.0
11+
12+
## 3.5.0
13+
14+
1、bug fixed
15+
16+
2、DoKit For Android Kotlin 编译插件版本为1.4.32,支持Gradle 6.8及以上版本
17+
18+
319
## 3.5.0.1-beta01
420

521
1、Support AGP 7.0

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div align="center">
2727
<img src="https://pt-starimg.didistatic.com/static/starimg/img/J0WO7tUi9U1616143930629.png" width = "250" alt="DoraemonKit" align=left />
2828
<img src="https://img.shields.io/github/license/didi/DoraemonKit.svg" align=left />
29-
<img src="https://img.shields.io/badge/Android-3.5.0_beta01-blue.svg" align=left />
29+
<img src="https://img.shields.io/badge/Android-3.5.0-blue.svg" align=left />
3030
<img src="https://img.shields.io/badge/iOS-3.0.7-yellow.svg" align=left />
3131
<img src="https://img.shields.io/badge/Flutter-0.6.0-blue.svg" align=left />
3232
<img src="https://img.shields.io/badge/miniapp-0.0.1-red.svg" align=left />

README_EN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div align="center">
22
<img src="https://javer.oss-cn-shanghai.aliyuncs.com/doraemon/github/DoraemonKit_github.png" width = "150" height = "150" alt="DoraemonKit" align=left />
33
<img src="https://img.shields.io/github/license/didi/DoraemonKit.svg" align=left />
4-
<img src="https://img.shields.io/badge/Android-3.5.0-beta01-blue.svg" align=left />
4+
<img src="https://img.shields.io/badge/Android-3.5.0.svg" align=left />
55
<img src="https://img.shields.io/badge/iOS-3.0.4-yellow.svg" align=left />
66
<img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" align=left />
77
</div>

0 commit comments

Comments
 (0)