update gradle

2048[HarmonyOS_Js_Full]/.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>

2048[HarmonyOS_Js_Full]/.idea/misc.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" 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>

2048[HarmonyOS_Js_Full]/.idea/sonarlint/issuestore/index.pb

@@ -11,8 +11,6 @@ P
 .entry/src/main/js/default/pages/index/index.js,3\6\36d48c2c0aa8cb6b91428b9d2d791dcae782d636
 ^
 .entry/src/main/js/default/pages/page0/page0.js,e\7\e76da2df200fc79b254b005f068d568bf8c2b7ec
-J
-entry/src/main/config.json,1\0\10f965cf51fe14a5ef0ca2ebefb1bd7e4607eeb2
 _
 /entry/src/main/js/default/pages/page0/page0.css,3\b\3bb84a6effd773d95ed647597ffe3ad387fdfbcf
 _
@@ -21,3 +19,11 @@ _
 /entry/src/main/js/default/pages/page0/page0.hml,6\2\6288971498872deb62c5e285d192d813e22b1c1c
 _
 /entry/src/main/js/default/pages/index/index.hml,e\b\eb4272ef57a8e412e241acf56c46fd3c2ccd3848
+X
+(gradle/wrapper/gradle-wrapper.properties,f\b\fbe448ebfc3eb2d4e308f6b8b043666f5b57235e
+<
+build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
+J
+entry/src/main/config.json,1\0\10f965cf51fe14a5ef0ca2ebefb1bd7e4607eeb2
+B
+entry/build.gradle,a\d\ad38b2dea33752cac233aa09d7dfbe582e9dded6

2048[HarmonyOS_Js_Full]/build.gradle

@@ -5,13 +5,13 @@ apply plugin: 'com.huawei.ohos.app'
 ohos {
     signingConfigs {
         debug {
-            storeFile file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.p12')
+            storeFile file('D:\\Gitlab\\Calculator-HarmonyOS-Full\\HOCal\\key\\xclcal.p12')
-            storePassword '000000189845B89E9938FEEBFE701FAEAC25439ED8DE6F976636C812F590E90DEF8C2D7240F79BEA'
+            storePassword '000000188445F98C50F77AD54D972EA8AF7C844B45D0040328A695CE74C9E893C34FD7C935FAF115'
-            keyAlias = 'debugKey'
+            keyAlias = 'xclcal'
-            keyPassword '00000018F7C68D0AD0D2776537D282AB0031F7235FF3D835EAC2ABA317D122EE3C2FD3679146F82A'
+            keyPassword '00000018D9A8F298ADDF68272A0002370AC7C39FA90960B724D294E85DBEE3E55D4B5522B1E6CC80'
             signAlg = 'SHA256withECDSA'
-            profile file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.p7b')
+            profile file('D:\\Downloads\\xcl20481Debug.p7b')
-            certpath file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.cer')
+            certpath file('D:\\Gitlab\\Calculator-HarmonyOS-Full\\HOCal\\key\\xclcald.cer')
         }
     }
     compileSdkVersion 6
@@ -27,8 +27,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.huawei.ohos:hap:3.0.3.4'
+        classpath 'com.huawei.ohos:hap:3.0.5.2'
-        classpath 'com.huawei.ohos:decctest:1.2.6.0'
+        classpath 'com.huawei.ohos:decctest:1.2.7.2'
     }
 }
 

2048[HarmonyOS_Js_Full]/entry/build.gradle

@@ -0,0 +1,26 @@
+apply plugin: 'com.huawei.ohos.hap'
+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 6
+    defaultConfig {
+        compatibleSdkVersion 6
+    }
+    buildTypes {
+        release {
+            proguardOpt {
+                proguardEnabled false
+                rulesFiles 'proguard-rules.pro'
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.har'])
+    testImplementation 'junit:junit:4.13.1'
+    ohosTestImplementation 'com.huawei.ohos.testkit:runner:2.0.0.200'
+}
+decc {
+    supportType = ['html', 'xml']
+}

2048[HarmonyOS_Js_Full]/entry/src/main/config.json

@@ -1,7 +1,7 @@
 {
   "app": {
     "apiVersion": {
-      "compatible": 5
+      "compatible": 6
     },
     "bundleName": "com.xcl20481.myapplication",
     "vendor": "2048",
@@ -21,7 +21,8 @@
     "mainAbility": "com.xcl20481.myapplication.MainAbility",
     "reqPermissions": [
       {
-        "name": "ohos.permission.VIBRATE"
+        "name": "ohos.permission.VIBRATE",
+        "reason": "用于长按振动反馈"
       }
     ],
     "deviceType": [
@@ -36,6 +37,15 @@
       "moduleType": "entry",
       "installationFree": false
     },
+    "metaData": {
+      "customizeData": [
+        {
+          "name": "hwc-theme",
+          "extra": "",
+          "value": "androidhwext:style/Theme.Emui.Translucent.NoTitleBar"
+        }
+      ]
+    },
     "abilities": [
       {
         "skills": [
@@ -50,7 +60,7 @@
         ],
         "visible": true,
         "name": "com.xcl20481.myapplication.MainAbility",
-        "icon": "$media:icon2",
+        "icon": "$media:icon",
         "description": "$string:mainability_description",
         "label": "$string:xcl2048",
         "type": "page",

2048[HarmonyOS_Js_Full]/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

2048[HarmonyOS_Js_Lite]/.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>

2048[HarmonyOS_Js_Lite]/.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>

2048[HarmonyOS_Js_Lite]/.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
 _
@@ -38,3 +30,11 @@ _
 /entry/src/main/js/default/pages/index/index.hml,e\b\eb4272ef57a8e412e241acf56c46fd3c2ccd3848
 ^
 .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

2048[HarmonyOS_Js_Lite]/build.gradle

@@ -0,0 +1,33 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+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 {
+    compileSdkVersion 6
+}
+
+buildscript {
+    repositories {
+        maven {
+            url 'https://repo.huaweicloud.com/repository/maven/'
+        }
+        maven {
+            url 'https://developer.huawei.com/repo/'
+        }
+    }
+    dependencies {
+        classpath 'com.huawei.ohos:hap:3.0.5.2'
+        classpath 'com.huawei.ohos:decctest:1.2.7.2'
+    }
+}
+
+allprojects {
+    repositories {
+        maven {
+            url 'https://repo.huaweicloud.com/repository/maven/'
+        }
+        maven {
+            url 'https://developer.huawei.com/repo/'
+        }
+    }
+}

2048[HarmonyOS_Js_Lite]/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']