From 58249439a7d37e1529a57cad01379c3915bd1f4b Mon Sep 17 00:00:00 2001
From: TxZgX <xcl@xuegao-tzx.top>
Date: Sat, 12 Feb 2022 19:28:24 +0800
Subject: [PATCH] update gradle

---
 2048l/.idea/gradle.xml                        |  2 +-
 2048l/.idea/misc.xml                          |  2 +-
 2048l/.idea/sonarlint/issuestore/index.pb     | 18 ++++++-------
 2048l/build.gradle                            | 26 +++----------------
 2048l/entry/build.gradle                      |  4 +--
 2048l/entry/src/main/config.json              | 11 +++++++-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 7 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/2048l/.idea/gradle.xml b/2048l/.idea/gradle.xml
index 4657570..9bdd85f 100644
--- a/2048l/.idea/gradle.xml
+++ b/2048l/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Huawei\DevEco Studio 3.0.0.601\tools\gradle" />
+        <option name="gradleHome" value="C:\Program Files\Huawei\DevEco Studio 3.0.0.800\tools\gradle" />
         <option name="gradleJvm" value="#JAVA_INTERNAL" />
         <option name="modules">
           <set>
diff --git a/2048l/.idea/misc.xml b/2048l/.idea/misc.xml
index 794aa67..58918f5 100644
--- a/2048l/.idea/misc.xml
+++ b/2048l/.idea/misc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/2048l/.idea/sonarlint/issuestore/index.pb b/2048l/.idea/sonarlint/issuestore/index.pb
index a2afba2..a55389a 100644
--- a/2048l/.idea/sonarlint/issuestore/index.pb
+++ b/2048l/.idea/sonarlint/issuestore/index.pb
@@ -1,6 +1,4 @@
 
-<
-build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
 :
 
 .gitignore,a\5\a5cc2925ca8258af241be7e5b0381edf30266302
@@ -14,8 +12,6 @@ X
 gradlew.bat,2\a\2a45a911a8f1836b0b6c5b758962572012d8f8c3
 A
 gradle.properties,2\a\2afbb999f001938c88fa43fc2ef52abf0f8213e4
-<
-package.json,7\0\7030d0b2f71b999ff89a343de08c414af32fc93a
 @
 entry/.gitignore,f\0\f0a6d47efb29aae09031985f74d3e6850f8e5432
 H
@@ -26,10 +22,6 @@ Y
 )entry/src/main/js/default/i18n/en-US.json,5\3\53c2f15f1da3e1de172f90feee9cf4143c3029f0
 Y
 )entry/src/main/js/default/i18n/zh-CN.json,0\3\037eb38d22a90ee435a04f5160df2347025c27e5
-J
-entry/src/main/config.json,1\0\10f965cf51fe14a5ef0ca2ebefb1bd7e4607eeb2
-B
-entry/build.gradle,a\d\ad38b2dea33752cac233aa09d7dfbe582e9dded6
 P
  entry/src/main/js/default/app.js,b\4\b4c4e536f4084a0b6a45f8b0d2725567135b92e6
 _
@@ -37,4 +29,12 @@ _
 _
 /entry/src/main/js/default/pages/index/index.hml,e\b\eb4272ef57a8e412e241acf56c46fd3c2ccd3848
 ^
-.entry/src/main/js/default/pages/index/index.js,3\6\36d48c2c0aa8cb6b91428b9d2d791dcae782d636
\ No newline at end of file
+.entry/src/main/js/default/pages/index/index.js,3\6\36d48c2c0aa8cb6b91428b9d2d791dcae782d636
+J
+entry/src/main/config.json,1\0\10f965cf51fe14a5ef0ca2ebefb1bd7e4607eeb2
+B
+entry/build.gradle,a\d\ad38b2dea33752cac233aa09d7dfbe582e9dded6
+<
+build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
+<
+package.json,7\0\7030d0b2f71b999ff89a343de08c414af32fc93a
\ No newline at end of file
diff --git a/2048l/build.gradle b/2048l/build.gradle
index 1e57f48..d1b5fd3 100644
--- a/2048l/build.gradle
+++ b/2048l/build.gradle
@@ -3,27 +3,7 @@ apply plugin: 'com.huawei.ohos.app'
 
 //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
 ohos {
-    signingConfigs {
-        debug {
-            storeFile file('C:\\Study\\key\\xcl2048.p12')
-            storePassword '00000018F7FAD4DE0BB863142993D255B63C586BFE9A4D554EB96CAC51C1C6CDC585B915635C71FE'
-            keyAlias = 'xcl2048'
-            keyPassword '000000180A8B74EFA0A1EBB5688ABB0B67ABC55BF31B52113CCDE96012B649EFAC035688455044DB'
-            signAlg = 'SHA256withECDSA'
-            profile file('C:\\Study\\key\\xcl2048Debug.p7b')
-            certpath file('C:\\Study\\key\\xcl2048.cer')
-        }
-        release {
-            storeFile file('C:\\Study\\key\\xcl2048.p12')
-            storePassword '00000018EC98F99FD59E53EA2D7277BB2A7A47A49EF2C571B438B41317A5F8BD3076BD495B0AA6B9'
-            keyAlias = 'xcl2048'
-            keyPassword '000000188C93967FFACA83A806DEB256E56D7BC2109E027760ED3904F370C99EF5AF5A35F008C506'
-            signAlg = 'SHA256withECDSA'
-            profile file('C:\\Study\\key\\xcl2048fRelease.p7b')
-            certpath file('C:\\Study\\key\\xcl2048f.cer')
-        }
-    }
-    compileSdkVersion 7
+    compileSdkVersion 6
 }
 
 buildscript {
@@ -36,8 +16,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.huawei.ohos:hap:3.0.3.4'
-        classpath 'com.huawei.ohos:decctest:1.2.6.0'
+        classpath 'com.huawei.ohos:hap:3.0.5.2'
+        classpath 'com.huawei.ohos:decctest:1.2.7.2'
     }
 }
 
diff --git a/2048l/entry/build.gradle b/2048l/entry/build.gradle
index 5ee794d..efd7a33 100644
--- a/2048l/entry/build.gradle
+++ b/2048l/entry/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.huawei.ohos.decctest'
 
 //For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
 ohos {
-    compileSdkVersion 7
+    compileSdkVersion 6
     defaultConfig {
         compatibleSdkVersion 6
     }
@@ -20,7 +20,7 @@ ohos {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.har'])
     testImplementation 'junit:junit:4.13.1'
-    ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.200'
+    ohosTestImplementation 'com.huawei.ohos.testkit:runner:2.0.0.200'
 }
 decc {
     supportType = ['html','xml']
diff --git a/2048l/entry/src/main/config.json b/2048l/entry/src/main/config.json
index db1e03e..1ced733 100644
--- a/2048l/entry/src/main/config.json
+++ b/2048l/entry/src/main/config.json
@@ -10,13 +10,22 @@
   "deviceConfig": {},
   "module": {
     "deviceType": [
-      "Wearable"
+      "liteWearable"
     ],
     "distro": {
       "deliveryWithInstall": true,
       "moduleName": "entry",
       "moduleType": "entry"
     },
+    "metaData": {
+      "customizeData": [
+        {
+          "name": "hwc-theme",
+          "extra": "",
+          "value": "androidhwext:style/Theme.Emui.Translucent.NoTitleBar"
+        }
+      ]
+    },
     "js": [
       {
         "pages": [
diff --git a/2048l/gradle/wrapper/gradle-wrapper.properties b/2048l/gradle/wrapper/gradle-wrapper.properties
index f59159e..63c817f 100644
--- a/2048l/gradle/wrapper/gradle-wrapper.properties
+++ b/2048l/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://repo.huaweicloud.com/gradle/gradle-6.3-bin.zip
+distributionUrl=https\://repo.huaweicloud.com/gradle/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists