From 38d68755e3c0520fb6499aa2d13136165e99fa22 Mon Sep 17 00:00:00 2001 From: xujianhong Date: Mon, 28 Jun 2021 10:47:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=82=E9=85=8D=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FloatingViewLib/build.gradle | 4 ++-- FloatingViewLib/src/main/config.json | 5 ----- README.md | 4 ++-- build.gradle | 8 ++++---- entry/build.gradle | 4 ++-- entry/src/main/config.json | 5 ----- entry/src/ohosTest/config.json | 5 ----- 7 files changed, 10 insertions(+), 25 deletions(-) diff --git a/FloatingViewLib/build.gradle b/FloatingViewLib/build.gradle index e3a8962..0030e4e 100644 --- a/FloatingViewLib/build.gradle +++ b/FloatingViewLib/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'com.huawei.ohos.library' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } @@ -12,7 +12,7 @@ ohos { } } } - + } dependencies { diff --git a/FloatingViewLib/src/main/config.json b/FloatingViewLib/src/main/config.json index a5e5859..52e9aaa 100644 --- a/FloatingViewLib/src/main/config.json +++ b/FloatingViewLib/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": { diff --git a/README.md b/README.md index 0174cac..01e2543 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ - 项目移植状态：主功能完成 - 调用差异：有,详见调用差异说明 - 基线版本：Release v1.0.2 -- 开发版本：sdk5，DevEco Studio 2.1 Release +- 开发版本：sdk6，DevEco Studio 2.2 Beta1 #### 效果演示 @@ -34,7 +34,7 @@ } ``` -在sdk5，DevEco Studio 2.1 Release下项目可直接运行 +在sdk6，DevEco Studio 2.2 Beta1下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 diff --git a/build.gradle b/build.gradle index 8844ee3..8726113 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,9 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } } @@ -19,8 +19,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.2' - classpath 'com.huawei.ohos:decctest:1.0.0.7' + classpath 'com.huawei.ohos:hap:2.4.5.0' + classpath 'com.huawei.ohos:decctest:1.2.4.1' } } diff --git a/entry/build.gradle b/entry/build.gradle index 53d1553..95f7e5b 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } @@ -15,5 +15,5 @@ dependencies { // implementation project(':FloatingViewLib') } decc { - supportType = ['html','xml'] + supportType = ['html', 'xml'] } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 9c884ee..5b9abe5 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json index b8b0231..73c9598 100644 --- a/entry/src/ohosTest/config.json +++ b/entry/src/ohosTest/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, -- Gitee From ecc35662689d5b28e108e75b69b25e072811f269 Mon Sep 17 00:00:00 2001 From: xujianhong Date: Mon, 28 Jun 2021 11:07:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E9=85=8D=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ README.md | 4 ++-- entry/build.gradle | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3644375..050f728 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 0.0.2-SNAPSHOT +ohos 第二个版本 ## 0.0.1-SNAPSHOT ohos 第一个版本 * 实现了原库的大部分 api diff --git a/README.md b/README.md index 01e2543..7eca700 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ 2.在entry模块的build.gradle文件中， ```java dependencies { - implementation('com.gitee.chinasoft_ohos:FloatingViewLib:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:FloatingViewLib:0.0.2-SNAPSHOT') ...... } ``` @@ -187,7 +187,7 @@ CloudTest代码测试无异常 #### 版本迭代 -- 0.0.1-SNAPSHOT +- 0.0.2-SNAPSHOT ## 版权和许可信息 diff --git a/entry/build.gradle b/entry/build.gradle index 95f7e5b..2872ef8 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) testImplementation 'junit:junit:4.13' ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' - implementation('com.gitee.chinasoft_ohos:FloatingView:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:FloatingView:0.0.2-SNAPSHOT') // implementation project(':FloatingViewLib') } decc { -- Gitee