From 5998fbb63ca40be01a7245d0a727e492dae3eae9 Mon Sep 17 00:00:00 2001
From: shetaotao <shetaotao050@chinasoftinc.com>
Date: Mon, 28 Jun 2021 11:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7SDK6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                              | 9 +++++++--
 README.md                                 | 6 +++---
 build.gradle                              | 6 +++---
 entry/build.gradle                        | 5 ++---
 entry/src/main/config.json                | 5 -----
 entry/src/ohosTest/config.json            | 5 -----
 securestoragelibrary/build.gradle         | 4 ++--
 securestoragelibrary/src/main/config.json | 5 -----
 8 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aeb0216..9fb842c 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 cdc202f..5b0f674 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 75ff32d..a4bbee5 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 4f27c46..d19918b 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 e366763..b2c7777 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 25d1f79..795bd67 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 0cf4722..2b89ad9 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 e75edc3..328f491 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": {},
-- 
Gitee