diff --git a/CHANGELOG.md b/CHANGELOG.md index 3644375f0f8176c1290ff360b1985a1f40a7d0c4..050f72875fa16c15ab43dc1c231ee29cc0370a4d 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/FloatingViewLib/build.gradle b/FloatingViewLib/build.gradle index e3a89620b6b96a3628e61bc7f289d7372508a54e..0030e4edb3895a7cf3250735df3c0c8f69cd07de 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 a5e5859e9ba43651221ee0b31bcbe4a134d04d8f..52e9aaa8b77f90ead1a79b49e4dcb15d7cf22280 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 0174cac0c63e61662886b2a2bae8bc15e4c3bbdf..7eca7004b14dd7cc45bf7963199d3341e9cee1d4 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 #### 效果演示 @@ -29,12 +29,12 @@ 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') ...... } ``` -在sdk5,DevEco Studio 2.1 Release下项目可直接运行 +在sdk6,DevEco Studio 2.2 Beta1下项目可直接运行 如无法运行,删除项目.gradle,.idea,build,gradle,build.gradle文件, 并依据自己的版本创建新项目,将新项目的对应文件复制到根目录下 @@ -187,7 +187,7 @@ CloudTest代码测试无异常 #### 版本迭代 -- 0.0.1-SNAPSHOT +- 0.0.2-SNAPSHOT ## 版权和许可信息 diff --git a/build.gradle b/build.gradle index 8844ee3f7f865a9ab90ab484059ec226684f5ec5..8726113cdae6d9978a42bdf9f0a80fbb0f37e8ec 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 53d155314ae57df456dc8e120506ac0d72004515..2872ef8a4be442d61bb174bce99687e28f33ac2b 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 } @@ -11,9 +11,9 @@ 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 { - supportType = ['html','xml'] + supportType = ['html', 'xml'] } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 9c884ee6d12584dc0c83de1f285ddfd973608a83..5b9abe52c7c2334279a076ba4ff199ba42565480 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 b8b02310009ffb2defa857e8488449a491f8f8eb..73c9598334cf43e8ea3c95d5cc0b1edf1a3950eb 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": {},