diff --git a/CHANGELOG.md b/CHANGELOG.md index aeb0216830815e1d88ca1d0e617a2d57baf07870..9fb842ce05148380d313f51b0c2efc8acbce40ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ -# 0.0.1-SNAPSHOT +## 0.0.2-SNAPSHOT +ohos 第2个版本 + * 更新sdk6 -ohos 第一个版本,完整实现了原库的全部 api \ No newline at end of file +## 0.0.1-SNAPSHOT +ohos 第1个版本 + * 完整实现了原库的全部 api + \ No newline at end of file diff --git a/README.md b/README.md index cdc202f304aa7831b4155dd892dfa54ad034ec59..5b0f6746761616f4cabb2815370df8e78455511d 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ - 项目移植状态:移植完成 - 调用差异:无 - 基线版本: Release 0.0.2 -- 开发版本:sdk5,DevEco Studio2.1 Release +- 开发版本:sdk6,DevEco Studio 2.2 Beta1 - 编程语言:Java ### 效果演示 @@ -35,7 +35,7 @@ dependencies { } ``` -在sdk5,DevEco Studio2.1 Release下项目可直接运行 如无法运行,删除项目.gradle,.idea,build,gradle,build.gradle文件, 并依据自己的版本创建新项目,将新项目的对应文件复制到根目录下 +在sdk6,DevEco Studio 2.2 Beta1下项目可直接运行 如无法运行,删除项目.gradle,.idea,build,gradle,build.gradle文件, 并依据自己的版本创建新项目,将新项目的对应文件复制到根目录下 ### 使用说明 secure-storage @@ -449,5 +449,5 @@ CloudTest代码测试无异常 ### 版本迭代 -- 0.0.1-SNAPSHOT +- 0.0.2-SNAPSHOT diff --git a/build.gradle b/build.gradle index 75ff32d4eb5d7550466b5e4c76f784359a8ce33e..a4bbee50c84428507c792bf978676f0ff6fe17a8 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { 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 4f27c4600cf5f28ff044784b23bcb3b68d85f7d9..d19918be8d5b55201ab6b6270e3c55b0698a5a3b 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 } @@ -18,8 +18,7 @@ ohos { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) -// implementation project(path: ':securestoragelibrary') - implementation('com.gitee.chinasoft_ohos:secure-storage-ohos:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:secure-storage-ohos:0.0.2-SNAPSHOT') testImplementation 'junit:junit:4.12' ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index e3667633eaaa9375e07062be6fa7ad7a51928135..b2c777717bd12f5c9e3bb3060f063c94cb1634aa 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json index 25d1f79be5084b6a3ccba19cf4d7d3c16bca854c..795bd67b6bc4d7deb7809c83f8b4f746886e1ba8 100644 --- a/entry/src/ohosTest/config.json +++ b/entry/src/ohosTest/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/securestoragelibrary/build.gradle b/securestoragelibrary/build.gradle index 0cf4722bbc6f99007ec8c5e9c90bf2bde095c0cf..2b89ad9d449d8efa84a1c9654b92e338de1fe40d 100644 --- a/securestoragelibrary/build.gradle +++ b/securestoragelibrary/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/securestoragelibrary/src/main/config.json b/securestoragelibrary/src/main/config.json index e75edc389a21b08f3305de6e43127561d5e651e5..328f491e4887a64ec1a2c37d77e8b4d229ee851b 100644 --- a/securestoragelibrary/src/main/config.json +++ b/securestoragelibrary/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {},