From b47b06b1be29a1ac84ab3c3e9f7939270a8c1ab2 Mon Sep 17 00:00:00 2001
From: wang zhen <wangzhen082@chinasoftinc.com>
Date: Mon, 28 Jun 2021 10:58:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Dsdk6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                 | 4 ++++
 README.md                    | 8 ++++----
 build.gradle                 | 6 +++---
 entry/build.gradle           | 2 +-
 entry/src/main/config.json   | 5 -----
 library/build.gradle         | 4 ++--
 library/src/main/config.json | 5 -----
 7 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2312fb6..22e0f40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.2-SNAPSHOT
+
+ohos 第二个版本，适配了最新的SDK6
+
 ## 0.0.1-SNAPSHOT
 
 ohos 第一个版本，完整实现了原库的全部 api
\ No newline at end of file
diff --git a/README.md b/README.md
index 7693ead..9c1ed64 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 - 项目移植状态：主功能完成
 - 调用差异：无
 - 基线版本： master
-- 开发版本：sdk5，DevEco Studio2.1 Release(实时更新以当前最新版本为准)
+- 开发版本：sdk6，DevEco Studio2.2 Beta1
 
 #### 效果演示
 <p align="center">
@@ -30,11 +30,11 @@ allprojects {
 2.在entry模块的build.gradle文件中，
 ```xml
  dependencies {
-    implementation('com.gitee.chinasoft_ohos:ExpandTextView:0.0.1-SNAPSHOT')
+    implementation('com.gitee.chinasoft_ohos:ExpandTextView:0.0.2-SNAPSHOT')
     
  }
 ```
-在sdk5，DevEco Studio2.1 Release下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下
+
 
 #### 使用说明
 
@@ -85,5 +85,5 @@ CloudTest代码测试无异常
 
 #### 版本迭代
 
-- 0.0.1-SNAPSHOT
+- 0.0.2-SNAPSHOT
 
diff --git a/build.gradle b/build.gradle
index d3c9f1f..bf479ca 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 0919033..1f2dccc 100644
--- a/entry/build.gradle
+++ b/entry/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.huawei.ohos.hap'
 apply plugin: 'com.huawei.ohos.decctest'
 ohos {
 
-    compileSdkVersion 5
+    compileSdkVersion 6
     defaultConfig {
         compatibleSdkVersion 5
     }
diff --git a/entry/src/main/config.json b/entry/src/main/config.json
index c3a79c7..28ff60f 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/library/build.gradle b/library/build.gradle
index 25ddf0c..519a1c7 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.huawei.ohos.library'
 ohos {
-    compileSdkVersion 5
+    compileSdkVersion 6
     defaultConfig {
-        compatibleSdkVersion 5
+        compatibleSdkVersion 6
     }
     buildTypes {
         release {
diff --git a/library/src/main/config.json b/library/src/main/config.json
index 971fb37..bb72393 100644
--- a/library/src/main/config.json
+++ b/library/src/main/config.json
@@ -5,11 +5,6 @@
     "version": {
       "code": 1000000,
       "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 5,
-      "target": 5,
-      "releaseType": "Release"
     }
   },
   "deviceConfig": {
-- 
Gitee