update gradle

This commit is contained in:
田梓萱 2022-02-12 19:24:25 +08:00
parent ee3a875ce9
commit 3e0c72c9ab
29 changed files with 35 additions and 301 deletions

View File

@ -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>

View File

@ -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>

Binary file not shown.

View File

@ -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
_
@ -20,4 +18,12 @@ _
_
/entry/src/main/js/default/pages/page0/page0.hml,6\2\6288971498872deb62c5e285d192d813e22b1c1c
_
/entry/src/main/js/default/pages/index/index.hml,e\b\eb4272ef57a8e412e241acf56c46fd3c2ccd3848
/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

View File

@ -1,37 +0,0 @@
{
"agcgw_all":{
"CN":"connect-drcn.dbankcloud.cn",
"CN_back":"connect-drcn.hispace.hicloud.com",
"DE":"connect-dre.dbankcloud.cn",
"DE_back":"connect-dre.hispace.hicloud.com",
"RU":"connect-drru.dbankcloud.cn",
"RU_back":"connect-drru.hispace.hicloud.com",
"SG":"connect-dra.dbankcloud.cn",
"SG_back":"connect-dra.hispace.hicloud.com"
},
"client":{
"cp_id":"56657123",
"product_id":"737518067793736787",
"client_id":"762329203499615488",
"client_secret":"[!00A00BA9DEE2EE7747F9F30DB21E2A2616FD064D36C8B4BADA99E146F8A9D30ABA14098C61FA48E600A90FA8CD63E096972CF8186C53424D840AFE50C3797974F436ABC8462E7B6865E1E16DA7B94792D05C21F5A35F341C77F28A3C4FA6F85866]",
"project_id":"737518067793736787",
"app_id":"105206265",
"api_key":"[!00854F5F9018C3E704B93E22B435C683904300122B0B318C8D07FCAD9E8EF3DC93E434EA08CA13223506BC7633ED71EF2220B0CD308A2F6755366524D8E2308480367DF9757EC20679ABD7A593DC52C8F7847EBFE12FF91D9629C4AA430F6456D9DE5DB20BD519B04D254D27B4B979ABDD876D7E481BBCF723299EBA9C5F53AC44]",
"package_name":"com.xcl20481.myapplication"
},
"oauth_client":{
"client_id":"105206265",
"client_type":30
},
"app_info":{
"app_id":"789706653405555520",
"package_name":"com.xcl20481.myapplication"
},
"code":{
"code1":"5D5ADBAA2F552D1A56E15069289B06F0",
"code2":"9F517684338B58C149755A692207A16E",
"code3":"02E063FD412D97BAE350C41C8294DFDF",
"code4":"DCAD5BA6BD850402D4AEF5B150FB33DD"
},
"configuration_version":"3.0"
}

View File

@ -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')
storePassword '000000189845B89E9938FEEBFE701FAEAC25439ED8DE6F976636C812F590E90DEF8C2D7240F79BEA'
keyAlias = 'debugKey'
keyPassword '00000018F7C68D0AD0D2776537D282AB0031F7235FF3D835EAC2ABA317D122EE3C2FD3679146F82A'
storeFile file('D:\\Gitlab\\Calculator-HarmonyOS-Full\\HOCal\\key\\xclcal.p12')
storePassword '000000188445F98C50F77AD54D972EA8AF7C844B45D0040328A695CE74C9E893C34FD7C935FAF115'
keyAlias = 'xclcal'
keyPassword '00000018D9A8F298ADDF68272A0002370AC7C39FA90960B724D294E85DBEE3E55D4B5522B1E6CC80'
signAlg = 'SHA256withECDSA'
profile file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.p7b')
certpath file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.cer')
profile file('D:\\Downloads\\xcl20481Debug.p7b')
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:decctest:1.2.6.0'
classpath 'com.huawei.ohos:hap:3.0.5.2'
classpath 'com.huawei.ohos:decctest:1.2.7.2'
}
}

View File

@ -2,18 +2,7 @@ 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 {
signingConfigs {
debug {
storeFile file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.p12')
storePassword '000000184687F86CE825B945C63332C663B49040D417619ED0F20979ACB29ACE21EE6BB17DEA1B44'
keyAlias = 'debugKey'
keyPassword '0000001865A11CDD718E32FF669EE7AD4AAB69761F5E7492D75D7FE30C0192AF12585B4EC9F4A770'
signAlg = 'SHA256withECDSA'
profile file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.p7b')
certpath file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.cer')
}
}
compileSdkVersion 7
compileSdkVersion 6
defaultConfig {
compatibleSdkVersion 6
}
@ -30,7 +19,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']

View File

@ -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",

View File

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

View File

@ -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

View File

@ -1,2 +0,0 @@
#Thu Dec 30 08:35:30 CST 2021
gradle.version=6.3

View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="MyApplication1" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="Gradle: hamcrest-core-1.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="Gradle: junit-4.13">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.13/e49ccba652b735c93bd6e6f59760d8254cf597dd/junit-4.13.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="Gradle: junit-4.13.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.13.1/cdd00374f1fee76b11e2a9d127405aa3f6be5b6a/junit-4.13.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="Gradle: runner-1.0.0.200">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.huawei.ohos.testkit/runner/1.0.0.200/db197b4a9c96bb98eb7888e957867588f55251a9/runner-1.0.0.200.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/MyApplication1.iml" filepath="$PROJECT_DIR$/.idea/MyApplication1.iml" group="MyApplication1" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/entry/entry.iml" filepath="$PROJECT_DIR$/.idea/modules/entry/entry.iml" group="MyApplication1/entry" />
</modules>
</component>
</project>

View File

@ -1,68 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":entry" external.linked.project.path="$MODULE_DIR$/../../../entry" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="MyApplication1" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":entry" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
<option name="LAST_KNOWN_AGP_VERSION" />
</configuration>
</facet>
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/../../../entry/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
<facet type="ohos" name="Ohos">
<configuration>
<option name="configurationProperty" value="This is option under configuration" />
<option name="gradleProjectPath" value=":entry" />
<option name="moduleExternalName" value="entry" />
<option name="moduleName" value="entry" />
</configuration>
</facet>
<facet type="harmony" name="harmony">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="GENERATE_RESOURCES_TASK_NAME" value="generateDebugResources" />
<option name="RESOURCES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../entry/src/main/resources;file://$MODULE_DIR$/../../../entry/src/debug/resources" />
<option name="OHOS_TEST_RESOURCES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../entry/src/ohosTest/resources;file://$MODULE_DIR$/../../../entry/src/debugOhosTest/resources" />
<option name="MODULE_TYPE" value="entry" />
<option name="DEBUGGABLE" value="true" />
<option name="HAP_OUTPUT_FOLDER_PATH" value="D:\OneDrive - Sinclair Community College\Github\2048-HarmonyOS-Full\MyApplication1\entry\build\outputs\hap\debug" />
<option name="PREVIEW_EXECUTE_TASK_NAME" value="generateDebugJsManifest" />
<option name="JS_MANIFEST_PATH" value="D:\OneDrive - Sinclair Community College\Github\2048-HarmonyOS-Full\MyApplication1\entry\build\intermediates\js\debug\jsManifest" />
<option name="SUPERVISUAL_SOURCE_DIR_PATH" value="D:\OneDrive - Sinclair Community College\Github\2048-HarmonyOS-Full\MyApplication1\entry\src\main\supervisual" />
<option name="JS_SOURCE_DIR_PATH" value="D:\OneDrive - Sinclair Community College\Github\2048-HarmonyOS-Full\MyApplication1\entry\src\main\js" />
<option name="ETS_SOURCE_DIR_PATH" value="D:\OneDrive - Sinclair Community College\Github\2048-HarmonyOS-Full\MyApplication1\entry\src\main\ets" />
<option name="MERGE_JS_SRC" value="false" />
<option name="COMPILE_MODE_TYPE" value="d8" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/../../../entry/build/intermediates/javac/debug/classes" />
<output-test url="file://$MODULE_DIR$/../../../entry/build/intermediates/javac/debugTest/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../../entry">
<sourceFolder url="file://$MODULE_DIR$/../../../entry/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../../entry/src/main/js" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../../entry/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/../../../entry/src/ohosTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../entry/src/ohosTest/js" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../entry/src/ohosTest/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/../../../entry/.cxx" />
<excludeFolder url="file://$MODULE_DIR$/../../../entry/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/../../../entry/.preview" />
<excludeFolder url="file://$MODULE_DIR$/../../../entry/build" />
</content>
<orderEntry type="jdk" jdkName="SDK(API Version 7)" jdkType="SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" scope="TEST" name="Gradle: hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="Gradle: junit-4.13" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="Gradle: runner-1.0.0.200" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="Gradle: junit-4.13.1" level="project" />
</component>
</module>

View File

@ -1,87 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="07c9026e-aa56-4298-9c5b-83f5e02250be" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/3/6/36d48c2c0aa8cb6b91428b9d2d791dcae782d636" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/index.pb" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/sonarlint/issuestore/index.pb" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
</projectState>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="ProjectId" id="22yzH0rn1UHNxaXNEODM0SwbeRP" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.ide.version" value="3.0.0.601" />
</component>
<component name="RunManager" selected="HarmonyOS App.entry">
<configuration name="entry" type="OhosDebugTask" factoryName="HarmonyOS App">
<module name="entry" />
<option name="DEPLOY" value="true" />
<option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
<option name="DEPLOY_AS_INSTANT" value="false" />
<option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" />
<option name="CLEAR_LOGCAT" value="false" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
<option name="FORCE_STOP_RUNNING_APP" value="true" />
<option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
<option name="DEBUGGER_TYPE" value="Auto" />
<Auto />
<Dual />
<DualJs />
<Java />
<Js />
<Native />
<Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
</Profilers>
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<DEPLOY_MULTI_HAP>false</DEPLOY_MULTI_HAP>
<REINSTALL_APPLICATION>false</REINSTALL_APPLICATION>
<method v="2">
<option name="Ohos.Build.BeforeRunTask" enabled="true" />
</method>
</configuration>
<configuration name="Super App" type="OhosSuperAppDebugTask" factoryName="HarmonyOS Super App">
<method v="2">
<option name="Ohos.Build.BeforeRunTask" enabled="true" />
</method>
</configuration>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="07c9026e-aa56-4298-9c5b-83f5e02250be" name="Default Changelist" comment="" />
<created>1640824524264</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1640824524264</updated>
</task>
<servers />
</component>
</project>

View File

@ -1,12 +0,0 @@
## This file is automatically generated by DevEco Studio.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Thu Dec 30 08:35:26 CST 2021
nodejs.dir=C\:\\Program Files\\Huawei\\DevEco Studio 3.0.0.601\\tools\\nodejs
hwsdk.dir=C\:\\Users\\honor\\AppData\\Local\\Huawei\\Sdk