From 8c1ed9f97fb7d5ac7049360ed39ad766f655e0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 29 Oct 2021 20:51:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=20Maven=20=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- OCH/mogo-och-bus/build.gradle | 3 + OCH/mogo-och-noop/build.gradle | 4 +- OCH/mogo-och-taxi/build.gradle | 3 + OCH/mogo-och/build.gradle | 3 + app/build.gradle | 10 +- config.gradle | 38 ++- .../mogo-core-function-autopilot/build.gradle | 6 +- .../gradle.properties | 4 +- .../mogo-core-function-check/build.gradle | 12 +- .../gradle.properties | 4 +- .../mogo-core-function-hmi/build.gradle | 8 +- .../mogo-core-function-hmi/gradle.properties | 4 +- .../mogo-core-function-map/build.gradle | 6 +- .../mogo-core-function-map/gradle.properties | 4 +- .../build.gradle | 8 +- .../gradle.properties | 4 +- .../mogo-core-function-notice/build.gradle | 12 +- .../gradle.properties | 4 +- .../mogo-core-function-obu-mogo/build.gradle | 5 +- .../gradle.properties | 4 +- .../mogo-core-function-smp/build.gradle | 7 +- .../mogo-core-function-smp/gradle.properties | 4 +- .../mogo-core-function-v2x/build.gradle | 6 +- .../mogo-core-function-v2x/gradle.properties | 4 +- core/mogo-core-data/build.gradle | 2 +- core/mogo-core-function-api/build.gradle | 2 +- core/mogo-core-function-api/gradle.properties | 4 +- core/mogo-core-function-call/build.gradle | 4 +- .../mogo-core-function-call/gradle.properties | 4 +- core/mogo-core-network/build.gradle | 2 +- core/mogo-core-network/gradle.properties | 2 +- core/mogo-core-res/build.gradle | 2 +- core/mogo-core-res/gradle.properties | 2 +- core/mogo-core-utils/gradle.properties | 2 +- foudations/mogo-commons/build.gradle | 4 +- gradle.properties | 237 +++++++++--------- libraries/map-autonavi/build.gradle | 2 + libraries/map-custom/build.gradle | 4 + libraries/mogo-map-api/build.gradle | 2 + libraries/mogo-map/build.gradle | 3 + .../mogo-module-main-launcher/build.gradle | 2 +- modules-back.txt | 52 ++++ modules.txt | 33 +-- modules/mogo-module-adas/build.gradle | 5 + modules/mogo-module-apps/build.gradle | 2 + modules/mogo-module-back/build.gradle | 2 + modules/mogo-module-carchatting/build.gradle | 3 + modules/mogo-module-chat/build.gradle | 20 +- modules/mogo-module-common/build.gradle | 9 +- modules/mogo-module-extensions/build.gradle | 4 + modules/mogo-module-main/build.gradle | 4 +- modules/mogo-module-map/build.gradle | 3 +- modules/mogo-module-obu/build.gradle | 1 + modules/mogo-module-push/build.gradle | 2 + modules/mogo-module-service/build.gradle | 4 + modules/mogo-module-share/build.gradle | 3 +- modules/mogo-module-v2x/build.gradle | 4 + modules/tanlulib/build.gradle | 4 +- services/mogo-service-api/build.gradle | 9 +- services/mogo-service/build.gradle | 4 +- 60 files changed, 380 insertions(+), 235 deletions(-) create mode 100644 modules-back.txt diff --git a/OCH/mogo-och-bus/build.gradle b/OCH/mogo-och-bus/build.gradle index 55525d9984..51cbf8bbe8 100644 --- a/OCH/mogo-och-bus/build.gradle +++ b/OCH/mogo-och-bus/build.gradle @@ -51,11 +51,14 @@ dependencies { implementation rootProject.ext.dependencies.mogoutils implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.modulecommon + + implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(":OCH:mogo-och") implementation project(":foudations:mogo-utils") implementation project(":foudations:mogo-commons") implementation project(":modules:mogo-module-common") + implementation project(':core:mogo-core-data') } diff --git a/OCH/mogo-och-noop/build.gradle b/OCH/mogo-och-noop/build.gradle index 19a041cbe2..317555f914 100644 --- a/OCH/mogo-och-noop/build.gradle +++ b/OCH/mogo-och-noop/build.gradle @@ -44,12 +44,14 @@ dependencies { implementation rootProject.ext.dependencies.mogooch implementation rootProject.ext.dependencies.mogoutils implementation rootProject.ext.dependencies.mogocommons + + implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(":OCH:mogo-och") implementation project(":foudations:mogo-utils") implementation project(":foudations:mogo-commons") - implementation project(':core:mogo-core-data') + implementation project(':core:mogo-core-data') } } diff --git a/OCH/mogo-och-taxi/build.gradle b/OCH/mogo-och-taxi/build.gradle index 0453ce4c85..d917e7cf82 100644 --- a/OCH/mogo-och-taxi/build.gradle +++ b/OCH/mogo-och-taxi/build.gradle @@ -47,11 +47,14 @@ dependencies { implementation rootProject.ext.dependencies.mogoutils implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.modulecommon + + implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(":OCH:mogo-och") implementation project(":foudations:mogo-utils") implementation project(":foudations:mogo-commons") implementation project(":modules:mogo-module-common") + implementation project(':core:mogo-core-data') } } diff --git a/OCH/mogo-och/build.gradle b/OCH/mogo-och/build.gradle index 1a55b51f32..93721d6687 100644 --- a/OCH/mogo-och/build.gradle +++ b/OCH/mogo-och/build.gradle @@ -46,10 +46,13 @@ dependencies { implementation rootProject.ext.dependencies.mogoutils implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.modulecommon + + implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(":foudations:mogo-utils") implementation project(":foudations:mogo-commons") implementation project(":modules:mogo-module-common") + implementation project(':core:mogo-core-data') } diff --git a/app/build.gradle b/app/build.gradle index ac01eaba74..708fdab9ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -162,8 +162,6 @@ dependencies { implementation rootProject.ext.dependencies.mogoaicloudservicesdk implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.modulecommon - implementation rootProject.ext.dependencies.modulesearch - implementation rootProject.ext.dependencies.mogomoduleauth implementation rootProject.ext.dependencies.mogoservice implementation rootProject.ext.dependencies.moduleV2x implementation rootProject.ext.dependencies.moduleshare @@ -171,23 +169,21 @@ dependencies { implementation rootProject.ext.dependencies.mogomonitor implementation rootProject.ext.dependencies.moduleextensions implementation rootProject.ext.dependencies.modulemap - implementation rootProject.ext.dependencies.moduleSmallMap - implementation rootProject.ext.dependencies.moduleHmi + implementation rootProject.ext.dependencies.mogo_core_function_smp + implementation rootProject.ext.dependencies.mogo_core_function_hmi + implementation rootProject.ext.dependencies.mogomodulewidgets implementation rootProject.ext.dependencies.moduleobumogo implementation rootProject.ext.dependencies.moduleADAS implementation rootProject.ext.dependencies.mogomoduleback - implementation rootProject.ext.dependencies.mogomodulewidgets implementation rootProject.ext.dependencies.modulemainlauncher implementation rootProject.ext.dependencies.moduleapps implementation rootProject.ext.dependencies.modulepushbase implementation rootProject.ext.dependencies.modulepush - implementation rootProject.ext.dependencies.moduleleftpanelnoop implementation rootProject.ext.dependencies.crashreportupgrade implementation rootProject.ext.dependencies.crashreportbugly implementation rootProject.ext.dependencies.callchat implementation rootProject.ext.dependencies.callchatprovider - } else { implementation project(':foudations:mogo-aicloud-services-sdk') implementation project(':foudations:mogo-commons') diff --git a/config.gradle b/config.gradle index 0445462b3e..a39c032f70 100644 --- a/config.gradle +++ b/config.gradle @@ -108,17 +108,14 @@ ext { mogoserviceapi : "com.mogo.service:mogo-service-api:${MOGO_SERVICE_API_VERSION}", moduleapps : "com.mogo.module:module-apps:${MOGO_MODULE_APPS_VERSION}", moduleextensions : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}", - chat : "com.mogo.module.carchatout:module-chat:${CHAT_VERSION}", - callchat : "com.mogo.module.carchatout:module-carchatting:${CARCHATTING_VERSION}", - callchatprovider : "com.mogo.module.carchatout:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}", + chat : "com.mogo.module.carchatout:module-chat:${MOGO_MODULE_CHAT_VERSION}", + callchat : "com.mogo.module.carchatout:module-carchatting:${MOGO_MODULE_CARCHATTING_VERSION}", + callchatprovider : "com.mogo.module.carchatout:module-carchatting-provider:${MOGO_MODULE_CARCHATTINGPROVIDER_VERSION}", guideshow : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDESHOW_VERSION}", - mogomodulecheck : "com.mogo.module:mogo-module-check:${MOGO_MODULE_CHECK_VERSION}", // V2X moduleV2x : "com.mogo.module:module-v2x:${MOGO_MODULE_V2X_VERSION}", - moduleSmallMap : "com.mogo.module:module-small-map:${MOGO_MODULE_SMP_VERSION}", moduleADAS : "com.mogo.module:mogo-module-adas:${MOGO_MODULE_ADAS_VERSION}", - moduleHmi : "com.mogo.module:module-hmi:${MOGO_MODULE_HMI_VERSION}", modulemedia : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}", modulesearch : "com.mogo.module:module-search:${MOGO_MODULE_SEARCH_VERSION}", // push @@ -250,20 +247,21 @@ ext { // 新架构的 Maven 版本管理 - mogo_core_function_autopilot : "mogo.core.function:autopilot:${MOGO_CORE_FUNCTION_AUTOPILOT}", - mogo_core_function_check : "mogo.core.function:check:${MOGO_CORE_FUNCTION_CHECK}", - mogo_core_function_hmi : "mogo.core.function:hmi:${MOGO_CORE_FUNCTION_HMI}", - mogo_core_function_map : "mogo.core.function:map:${MOGO_CORE_FUNCTION_MAP}", - mogo_core_function_monitoring: "mogo.core.function:monitoring:${MOGO_CORE_FUNCTION_MONITORING}", - mogo_core_function_notice : "mogo.core.function:notice:${MOGO_CORE_FUNCTION_NOTICE}", - mogo_core_function_obu_mogo : "mogo.core.function:obu.mogo:${MOGO_CORE_FUNCTION_OBU_MOGO}", - mogo_core_function_smp : "mogo.core.function:smp:${MOGO_CORE_FUNCTION_SMP}", - mogo_core_function_v2x : "mogo.core.function:v2x:${MOGO_CORE_FUNCTION_V2X}", - mogo_core_function_api : "mogo.core.function:api:${MOGO_CORE_FUNCTION_API}", - mogo_core_function_call : "mogo.core.function:call:${MOGO_CORE_FUNCTION_CALL}", - mogo_core_data : "mogo.core:data:${MOGO_CORE_DATA}", - mogo_core_res : "mogo.core:res:${MOGO_CORE_RES}", - mogo_core_utils : "mogo.core:utils:${MOGO_CORE_UTILS}", + mogo_core_function_autopilot : "com.mogo.eagle.core.function.impl:autopilot:${MOGO_CORE_FUNCTION_AUTOPILOT_VERSION}", + mogo_core_function_check : "com.mogo.eagle.core.function.impl:check:${MOGO_CORE_FUNCTION_CHECK_VERSION}", + mogo_core_function_hmi : "com.mogo.eagle.core.function.impl:hmi:${MOGO_CORE_FUNCTION_HMI_VERSION}", + mogo_core_function_map : "com.mogo.eagle.core.function.impl:map:${MOGO_CORE_FUNCTION_MAP_VERSION}", + mogo_core_function_monitoring: "com.mogo.eagle.core.function.impl:monitoring:${MOGO_CORE_FUNCTION_MONITORING_VERSION}", + mogo_core_function_notice : "com.mogo.eagle.core.function.impl:notice:${MOGO_CORE_FUNCTION_NOTICE_VERSION}", + mogo_core_function_obu_mogo : "com.mogo.eagle.core.function.impl:obu.mogo:${MOGO_CORE_FUNCTION_OBU_MOGO_VERSION}", + mogo_core_function_smp : "com.mogo.eagle.core.function.impl:smp:${MOGO_CORE_FUNCTION_SMP_VERSION}", + mogo_core_function_v2x : "com.mogo.eagle.core.function.impl:v2x:${MOGO_CORE_FUNCTION_V2X_VERSION}", + mogo_core_function_api : "com.mogo.eagle.core.function:api:${MOGO_CORE_FUNCTION_API_VERSION}", + mogo_core_function_call : "com.mogo.eagle.core.function:call:${MOGO_CORE_FUNCTION_CALL_VERSION}", + mogo_core_data : "com.mogo.eagle.core:data:${MOGO_CORE_DATA_VERSION}", + mogo_core_res : "com.mogo.eagle.core:res:${MOGO_CORE_RES_VERSION}", + mogo_core_utils : "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}", + mogo_core_network : "com.mogo.eagle.core:network:${MOGO_CORE_NETWORK_VERSION}", ] diff --git a/core/function-impl/mogo-core-function-autopilot/build.gradle b/core/function-impl/mogo-core-function-autopilot/build.gradle index 9593327e21..8c42f461e4 100644 --- a/core/function-impl/mogo-core-function-autopilot/build.gradle +++ b/core/function-impl/mogo-core-function-autopilot/build.gradle @@ -54,9 +54,11 @@ dependencies { implementation rootProject.ext.dependencies.adasHigh if (Boolean.valueOf(RELEASE)) { - + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_function_api + implementation rootProject.ext.dependencies.mogo_core_function_call } else { - implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-api') diff --git a/core/function-impl/mogo-core-function-autopilot/gradle.properties b/core/function-impl/mogo-core-function-autopilot/gradle.properties index 1126e026c9..52ad878f20 100644 --- a/core/function-impl/mogo-core-function-autopilot/gradle.properties +++ b/core/function-impl/mogo-core-function-autopilot/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.eagle.core -POM_ARTIFACT_ID=function-autopilot +GROUP=com.mogo.eagle.core.function.impl +POM_ARTIFACT_ID=autopilot VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-check/build.gradle b/core/function-impl/mogo-core-function-check/build.gradle index 1ea04bd867..a284da4d47 100644 --- a/core/function-impl/mogo-core-function-check/build.gradle +++ b/core/function-impl/mogo-core-function-check/build.gradle @@ -55,8 +55,16 @@ dependencies { if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.mogoserviceapi + + implementation rootProject.ext.dependencies.moduleservice + implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.callchatprovider + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_network + implementation rootProject.ext.dependencies.mogo_core_function_call + } else { implementation project(":foudations:mogo-commons") implementation project(':services:mogo-service-api') @@ -65,9 +73,9 @@ dependencies { implementation project(':modules:mogo-module-service') implementation project(':modules:mogo-module-carchattingprovider') - implementation project(':core:mogo-core-network') - implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-data') + implementation project(':core:mogo-core-utils') + implementation project(':core:mogo-core-network') implementation project(':core:mogo-core-function-call') } diff --git a/core/function-impl/mogo-core-function-check/gradle.properties b/core/function-impl/mogo-core-function-check/gradle.properties index 622ce1b86c..92cfc1d4d9 100644 --- a/core/function-impl/mogo-core-function-check/gradle.properties +++ b/core/function-impl/mogo-core-function-check/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.module -POM_ARTIFACT_ID=module-check +GROUP=com.mogo.eagle.core.function.impl +POM_ARTIFACT_ID=check VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index 5fc71fcd47..19d9a3c571 100644 --- a/core/function-impl/mogo-core-function-hmi/build.gradle +++ b/core/function-impl/mogo-core-function-hmi/build.gradle @@ -53,10 +53,16 @@ dependencies { kapt rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { + implementation rootProject.ext.dependencies.androidxrecyclerview + implementation rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_network + implementation rootProject.ext.dependencies.mogo_core_function_call } else { - implementation project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') + implementation project(':services:mogo-service-api') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') diff --git a/core/function-impl/mogo-core-function-hmi/gradle.properties b/core/function-impl/mogo-core-function-hmi/gradle.properties index 6d47fab546..e585ece483 100644 --- a/core/function-impl/mogo-core-function-hmi/gradle.properties +++ b/core/function-impl/mogo-core-function-hmi/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.eagle.core -POM_ARTIFACT_ID=function-hmi +GROUP=com.mogo.eagle.core.function.impl +POM_ARTIFACT_ID=hmi VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-map/build.gradle b/core/function-impl/mogo-core-function-map/build.gradle index 9593327e21..8c42f461e4 100644 --- a/core/function-impl/mogo-core-function-map/build.gradle +++ b/core/function-impl/mogo-core-function-map/build.gradle @@ -54,9 +54,11 @@ dependencies { implementation rootProject.ext.dependencies.adasHigh if (Boolean.valueOf(RELEASE)) { - + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_function_api + implementation rootProject.ext.dependencies.mogo_core_function_call } else { - implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-api') diff --git a/core/function-impl/mogo-core-function-map/gradle.properties b/core/function-impl/mogo-core-function-map/gradle.properties index 79e8393fa8..6a3e810e4c 100644 --- a/core/function-impl/mogo-core-function-map/gradle.properties +++ b/core/function-impl/mogo-core-function-map/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.eagle.core -POM_ARTIFACT_ID=function-map +GROUP=com.mogo.eagle.core.function.impl +POM_ARTIFACT_ID=map VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-monitoring/build.gradle b/core/function-impl/mogo-core-function-monitoring/build.gradle index ffe487bcb3..1f57ab6780 100644 --- a/core/function-impl/mogo-core-function-monitoring/build.gradle +++ b/core/function-impl/mogo-core-function-monitoring/build.gradle @@ -52,13 +52,15 @@ dependencies { kapt rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { - + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_res + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_function_api } else { - implementation project(':core:mogo-core-utils') - implementation project(':core:mogo-core-function-api') implementation project(':core:mogo-core-res') implementation project(':core:mogo-core-data') + implementation project(':core:mogo-core-function-api') } } diff --git a/core/function-impl/mogo-core-function-monitoring/gradle.properties b/core/function-impl/mogo-core-function-monitoring/gradle.properties index de3e7b3fbe..6853d19f1c 100644 --- a/core/function-impl/mogo-core-function-monitoring/gradle.properties +++ b/core/function-impl/mogo-core-function-monitoring/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.eagle.core -POM_ARTIFACT_ID=function-notice +GROUP=com.mogo.eagle.core.function.impl +POM_ARTIFACT_ID=monitoring VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-notice/build.gradle b/core/function-impl/mogo-core-function-notice/build.gradle index 6a98988a2b..fa1191f902 100644 --- a/core/function-impl/mogo-core-function-notice/build.gradle +++ b/core/function-impl/mogo-core-function-notice/build.gradle @@ -56,16 +56,22 @@ dependencies { implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon + + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_res + implementation rootProject.ext.dependencies.mogo_core_network + implementation rootProject.ext.dependencies.mogo_core_function_call } else { implementation project(":foudations:mogo-commons") implementation project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') - implementation project(':core:mogo-core-utils') - implementation project(':core:mogo-core-function-call') - implementation project(':core:mogo-core-res') implementation project(':core:mogo-core-data') + implementation project(':core:mogo-core-utils') + implementation project(':core:mogo-core-res') implementation project(':core:mogo-core-network') + implementation project(':core:mogo-core-function-call') } } diff --git a/core/function-impl/mogo-core-function-notice/gradle.properties b/core/function-impl/mogo-core-function-notice/gradle.properties index de3e7b3fbe..eb2cf9c236 100644 --- a/core/function-impl/mogo-core-function-notice/gradle.properties +++ b/core/function-impl/mogo-core-function-notice/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.eagle.core -POM_ARTIFACT_ID=function-notice +GROUP=com.mogo.eagle.core.function.impl +POM_ARTIFACT_ID=notice VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-obu-mogo/build.gradle b/core/function-impl/mogo-core-function-obu-mogo/build.gradle index d74e956534..9c9172f151 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/build.gradle +++ b/core/function-impl/mogo-core-function-obu-mogo/build.gradle @@ -53,7 +53,10 @@ dependencies { if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon - implementation rootProject.ext.dependencies.moduledata + + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_function_call } else { api project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') diff --git a/core/function-impl/mogo-core-function-obu-mogo/gradle.properties b/core/function-impl/mogo-core-function-obu-mogo/gradle.properties index 52bb3aba32..0d4b689fa3 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/gradle.properties +++ b/core/function-impl/mogo-core-function-obu-mogo/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.module -POM_ARTIFACT_ID=module-obu-mogo +GROUP=com.mogo.eagle.core.function.impl +POM_ARTIFACT_ID=obu-mogo VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-smp/build.gradle b/core/function-impl/mogo-core-function-smp/build.gradle index d2781dd354..0e85029d14 100644 --- a/core/function-impl/mogo-core-function-smp/build.gradle +++ b/core/function-impl/mogo-core-function-smp/build.gradle @@ -55,15 +55,20 @@ dependencies { if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogocommons api rootProject.ext.dependencies.mogoserviceapi + implementation rootProject.ext.dependencies.modulecommon + + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_res + implementation rootProject.ext.dependencies.mogo_core_function_call } else { api project(":foudations:mogo-commons") api project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') - implementation project(':core:mogo-core-res') implementation project(':core:mogo-core-data') + implementation project(':core:mogo-core-res') implementation project(':core:mogo-core-function-call') } } diff --git a/core/function-impl/mogo-core-function-smp/gradle.properties b/core/function-impl/mogo-core-function-smp/gradle.properties index 61d3012ece..26b19ff567 100644 --- a/core/function-impl/mogo-core-function-smp/gradle.properties +++ b/core/function-impl/mogo-core-function-smp/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.module -POM_ARTIFACT_ID=module-small-map +GROUP=com.mogo.eagle.core.function.impl +POM_ARTIFACT_ID=smp VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-v2x/build.gradle b/core/function-impl/mogo-core-function-v2x/build.gradle index 9593327e21..8c42f461e4 100644 --- a/core/function-impl/mogo-core-function-v2x/build.gradle +++ b/core/function-impl/mogo-core-function-v2x/build.gradle @@ -54,9 +54,11 @@ dependencies { implementation rootProject.ext.dependencies.adasHigh if (Boolean.valueOf(RELEASE)) { - + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_function_api + implementation rootProject.ext.dependencies.mogo_core_function_call } else { - implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-api') diff --git a/core/function-impl/mogo-core-function-v2x/gradle.properties b/core/function-impl/mogo-core-function-v2x/gradle.properties index 53bb97dede..63866596d3 100644 --- a/core/function-impl/mogo-core-function-v2x/gradle.properties +++ b/core/function-impl/mogo-core-function-v2x/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.eagle.core -POM_ARTIFACT_ID=function-v2x +GROUP=com.mogo.eagle.core.function.impl +POM_ARTIFACT_ID=v2x VERSION_CODE=1 diff --git a/core/mogo-core-data/build.gradle b/core/mogo-core-data/build.gradle index b806033fe3..7f3c6ac254 100644 --- a/core/mogo-core-data/build.gradle +++ b/core/mogo-core-data/build.gradle @@ -52,7 +52,7 @@ dependencies { kapt rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { - + implementation rootProject.ext.dependencies.mogo_core_res } else { implementation project(':core:mogo-core-res') } diff --git a/core/mogo-core-function-api/build.gradle b/core/mogo-core-function-api/build.gradle index a6f524c914..30f25d86fe 100644 --- a/core/mogo-core-function-api/build.gradle +++ b/core/mogo-core-function-api/build.gradle @@ -48,7 +48,7 @@ dependencies { kapt rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { - + implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(':core:mogo-core-data') } diff --git a/core/mogo-core-function-api/gradle.properties b/core/mogo-core-function-api/gradle.properties index 2f6fdd9216..85c516e67e 100644 --- a/core/mogo-core-function-api/gradle.properties +++ b/core/mogo-core-function-api/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.eagle.core -POM_ARTIFACT_ID=function-api +GROUP=com.mogo.eagle.core.function +POM_ARTIFACT_ID=api VERSION_CODE=1 diff --git a/core/mogo-core-function-call/build.gradle b/core/mogo-core-function-call/build.gradle index 09965e37ed..7550a516b4 100644 --- a/core/mogo-core-function-call/build.gradle +++ b/core/mogo-core-function-call/build.gradle @@ -48,7 +48,9 @@ dependencies { kapt rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { - + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_function_api } else { implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') diff --git a/core/mogo-core-function-call/gradle.properties b/core/mogo-core-function-call/gradle.properties index 585bc34412..6b8d869d31 100644 --- a/core/mogo-core-function-call/gradle.properties +++ b/core/mogo-core-function-call/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.eagle.core -POM_ARTIFACT_ID=function-call-api +GROUP=com.mogo.eagle.core.function +POM_ARTIFACT_ID=call VERSION_CODE=1 diff --git a/core/mogo-core-network/build.gradle b/core/mogo-core-network/build.gradle index 5f0c8bbc48..61667061b0 100644 --- a/core/mogo-core-network/build.gradle +++ b/core/mogo-core-network/build.gradle @@ -56,7 +56,7 @@ dependencies { implementation rootProject.ext.dependencies.livesdk if (Boolean.valueOf(RELEASE)) { - + implementation rootProject.ext.dependencies.mogo_core_utils } else { implementation project(':core:mogo-core-utils') } diff --git a/core/mogo-core-network/gradle.properties b/core/mogo-core-network/gradle.properties index c2c0c8afca..103c199633 100644 --- a/core/mogo-core-network/gradle.properties +++ b/core/mogo-core-network/gradle.properties @@ -1,3 +1,3 @@ GROUP=com.mogo.eagle.core -POM_ARTIFACT_ID=mogo-core-network +POM_ARTIFACT_ID=network VERSION_CODE=1 diff --git a/core/mogo-core-res/build.gradle b/core/mogo-core-res/build.gradle index 7f871eaebf..6716b28530 100644 --- a/core/mogo-core-res/build.gradle +++ b/core/mogo-core-res/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation rootProject.ext.dependencies.livesdk if (Boolean.valueOf(RELEASE)) { - + implementation rootProject.ext.dependencies.mogo_core_utils } else { implementation project(':core:mogo-core-utils') } diff --git a/core/mogo-core-res/gradle.properties b/core/mogo-core-res/gradle.properties index 585bc34412..cbfc95f7d1 100644 --- a/core/mogo-core-res/gradle.properties +++ b/core/mogo-core-res/gradle.properties @@ -1,3 +1,3 @@ GROUP=com.mogo.eagle.core -POM_ARTIFACT_ID=function-call-api +POM_ARTIFACT_ID=res VERSION_CODE=1 diff --git a/core/mogo-core-utils/gradle.properties b/core/mogo-core-utils/gradle.properties index ecd7c05582..4c6191a7d4 100644 --- a/core/mogo-core-utils/gradle.properties +++ b/core/mogo-core-utils/gradle.properties @@ -1,3 +1,3 @@ GROUP=com.mogo.eagle.core -POM_ARTIFACT_ID=util +POM_ARTIFACT_ID=utils VERSION_CODE=1 diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle index 48edf00cd5..7607cec182 100644 --- a/foudations/mogo-commons/build.gradle +++ b/foudations/mogo-commons/build.gradle @@ -48,7 +48,9 @@ dependencies { implementation rootProject.ext.dependencies.mogoutils api rootProject.ext.dependencies.mogoaicloudservicesdk api rootProject.ext.dependencies.ttsbase - implementation rootProject.ext.dependencies.skinsupport + + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_utils } else { implementation project(":foudations:mogo-utils") api project(":foudations:mogo-aicloud-services-sdk") diff --git a/gradle.properties b/gradle.properties index 2ae6805379..55139095bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,7 +37,7 @@ kapt.include.compile.classpath=false android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -android.jetifier.blacklist=module-service-2.0.58.aar +android.jetifier.blacklist=module-service-2.0.59.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ @@ -57,111 +57,17 @@ RELEASE=false #bytex.ASM_API=ASM7 HOOK_LOG_VERSION=1.4.63 SERVICE_CHAIN_VERSION=1.0.22 -# 模块版本 -## 工程内模块 -MOGO_COMMONS_VERSION=2.0.58 -MOGO_UTILS_VERSION=2.0.58 -MAP_AMAP_VERSION=2.0.58 -MAP_AUTONAVI_VERSION=2.0.58 -MOGO_MAP_VERSION=2.0.58 -MOGO_MAP_API_VERSION=2.0.58 -MOGO_SERVICE_VERSION=2.0.58 -MOGO_SERVICE_API_VERSION=2.0.58 -MOGO_CONNECTION_VERSION=2.0.58 -MOGO_MODULE_APPS_VERSION=2.0.58 -MOGO_MODULE_CHECK_VERSION=2.0.12 -MOGO_MODULE_NAVI_VERSION=2.0.58 -MOGO_MODULE_SHARE_VERSION=2.0.58 -MOGO_MODULE_COMMON_VERSION=2.0.58 -MOGO_MODULE_MAIN_VERSION=2.0.58 -MOGO_MODULE_MAP_VERSION=2.0.58 -MOGO_MODULE_SERVICE_VERSION=2.0.58 -MOGO_MODULE_DATA_VERSION=2.0.58 -MOGO_MODULE_EXTENSIONS_VERSION=2.0.58 -MOGO_MODULE_SEARCH_VERSION=2.0.58 -MOGO_MODULE_BACK_VERSION=2.0.58 -MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.58 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.58 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.58 -MOGO_MODULE_AUTHORIZE_VERSION=2.0.58 -MOGO_MODULE_GUIDE_VERSION=2.0.58 -MOGO_MODULE_MEDIA_VERSION=2.0.58 -MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.58 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.58 -MOGO_MODULE_V2X_VERSION=2.0.58 -MOGO_MODULE_HMI_VERSION=2.0.58 -# 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.58 -MOGO_BASE_SERVICES_APK_VERSION=2.0.58 -MOGO_BASE_SERVICES_SDK_VERSION=2.0.58 -## 工程外部模块 -# 探路 -MOGO_MODULE_TANLU_VERSION=2.0.58 -# 视频引导 -MOGO_MODULE_GUIDESHOW_VERSION=2.0.58 -# 推送 -MOGO_MODULE_PUSH_VERSION=2.0.58 -MOGO_MODULE_PUSH_BASE_VERSION=2.0.58 -MOGO_MODULE_PUSH_NOOP_VERSION=2.0.58 -# 探路上报和分享模块 -TANLULIB_VERSION=2.0.58 -MOGO_TANLU_API_VERSION=2.0.58 -#左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.0.58 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.58 -# 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.0.58 -# obu -MOGO_MODULE_OBU_VERSION=2.0.58 -MOGO_MODULE_OBU_MOGO_VERSION=2.0.58 -# 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.0.58 -MOGO_SKIN_LIGHT_VERSION=2.0.58 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.58 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.58 -SKIN_SUPPORT_VERSION=2.0.58 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.58 -SKIN_SUPPORT_CARDVIEW_VERSION=2.0.58 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.58 -SKIN_SUPPORT_DESIGN_VERSION=2.0.58 -# 闪屏页 -MOGO_MODULE_SPLASH_VERSION=2.0.58 -MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.58 -# monitor -MOGO_MODULE_MONITOR_VERSION=2.0.58 -# bugly -CRASHREPORT_VERSION=2.0.58 -CRASHREPORT_BUGLY_VERSION=2.0.58 -CRASHREPORT_NOOP_VERSION=2.0.58 -CRASHREPORT_UPGRADE_VERSION=2.0.58 -## tts -TTS_BASE_VERSION=2.0.58 -TTS_DI_VERSION=2.0.58 -TTS_ZHI_VERSION=2.0.58 -TTS_PAD_VERSION=2.0.58 -TTS_NOOP_VERSION=2.0.58 -# 自研地图 -MAP_CUSTOM_VERSION=2.0.58 -MOGO_MODULE_SMP_VERSION=2.0.58 -MOGO_MODULE_ADAS_VERSION=2.0.58 # OCH -MOGO_OCH_VERSION=2.0.58 -MOGO_OCH_BUS_VERSION=2.0.58 -MOGO_OCH_NOOP_VERSION=2.0.58 -MOGO_OCH_TAXI_VERSION=2.0.58 +MOGO_OCH_VERSION=2.0.59 +MOGO_OCH_BUS_VERSION=2.0.59 +MOGO_OCH_NOOP_VERSION=2.0.59 +MOGO_OCH_TAXI_VERSION=2.0.59 # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.58 -######## 外部依赖引用 -CHAT_VERSION=1.8.0 -# 车聊聊 -CARCHATTING_VERSION=2.3.5 -# 车聊聊接口 -CARCHATTINGPROVIDER_VERSION=1.1.20 -# websocket -WEBSOCKET_VERSION=1.1.7 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.59 +################ 外部依赖引用 ################ # loglib LOGLIB_VERSION=1.0.4 -######## MogoAiCloudSDK Version +######## MogoAiCloudSDK Version ######## # 网络请求 MOGO_NETWORK_VERSION=1.1.46 # 鉴权 @@ -178,27 +84,120 @@ MOGO_LIVE_VERSION=1.1.46 MOGO_TRAFFICLIVE_VERSION=1.1.46 # 定位服务 MOGO_LOCATION_VERSION=1.1.46 +######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=V2.0.0.1 -#################架构升级新的版本号 -MOGO_CORE_FUNCTION_HMI_VERSION=1.0.0 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级 applicationId=com.mogo.launcer applicationName=IntelligentPilot versionCode=80007 versionName=8.0.14 -#################新架构Maven版本管理 -MOGO_CORE_FUNCTION_AUTOPILOT=0.0.1 -MOGO_CORE_FUNCTION_CHECK=0.0.1 -MOGO_CORE_FUNCTION_HMI=0.0.1 -MOGO_CORE_FUNCTION_MAP=0.0.1 -MOGO_CORE_FUNCTION_MONITORING=0.0.1 -MOGO_CORE_FUNCTION_NOTICE=0.0.1 -MOGO_CORE_FUNCTION_OBU_MOGO=0.0.1 -MOGO_CORE_FUNCTION_SMP=0.0.1 -MOGO_CORE_FUNCTION_V2X=0.0.1 -MOGO_CORE_DATA=0.0.1 -MOGO_CORE_FUNCTION_API=0.0.1 -MOGO_CORE_FUNCTION_CALL=0.0.1 -MOGO_CORE_RES=0.0.1 -MOGO_CORE_UTILS=0.0.1 \ No newline at end of file +################# 新架构模块Maven版本管理 ################# +MOGO_CORE_FUNCTION_HMI_VERSION_VERSION=0.0.2 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.2 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.2 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.2 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.2 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.2 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.2 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.2 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.2 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.2 +MOGO_CORE_DATA_VERSION=0.0.2 +MOGO_CORE_FUNCTION_API_VERSION=0.0.2 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.2 +MOGO_CORE_RES_VERSION=0.0.2 +MOGO_CORE_UTILS_VERSION=0.0.2 +MOGO_CORE_NETWORK_VERSION=0.0.2 +################# 旧版本架构模块版本 ################# +## 工程内模块 +MOGO_COMMONS_VERSION=2.0.59 +MOGO_UTILS_VERSION=2.0.59 +MAP_AMAP_VERSION=2.0.59 +MAP_AUTONAVI_VERSION=2.0.59 +MOGO_MAP_VERSION=2.0.59 +MOGO_MAP_API_VERSION=2.0.59 +MOGO_SERVICE_VERSION=2.0.59 +MOGO_SERVICE_API_VERSION=2.0.59 +MOGO_CONNECTION_VERSION=2.0.59 +MOGO_MODULE_APPS_VERSION=2.0.59 +MOGO_MODULE_NAVI_VERSION=2.0.59 +MOGO_MODULE_SHARE_VERSION=2.0.59 +MOGO_MODULE_COMMON_VERSION=2.0.59 +MOGO_MODULE_MAIN_VERSION=2.0.59 +MOGO_MODULE_MAP_VERSION=2.0.59 +MOGO_MODULE_SERVICE_VERSION=2.0.59 +MOGO_MODULE_DATA_VERSION=2.0.59 +MOGO_MODULE_EXTENSIONS_VERSION=2.0.59 +MOGO_MODULE_SEARCH_VERSION=2.0.59 +MOGO_MODULE_BACK_VERSION=2.0.59 +MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.59 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.59 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.59 +MOGO_MODULE_AUTHORIZE_VERSION=2.0.59 +MOGO_MODULE_GUIDE_VERSION=2.0.59 +MOGO_MODULE_MEDIA_VERSION=2.0.59 +MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.59 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.59 +MOGO_MODULE_V2X_VERSION=2.0.59 +# 探路 +MOGO_MODULE_TANLU_VERSION=2.0.59 +# 视频引导 +MOGO_MODULE_GUIDESHOW_VERSION=2.0.59 +# 推送 +MOGO_MODULE_PUSH_VERSION=2.0.59 +MOGO_MODULE_PUSH_BASE_VERSION=2.0.59 +MOGO_MODULE_PUSH_NOOP_VERSION=2.0.59 +# 探路上报和分享模块 +TANLULIB_VERSION=2.0.59 +MOGO_TANLU_API_VERSION=2.0.59 +#左侧面板模块 +MOGO_MODULE_LEFT_PANEL_VERSION=2.0.59 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.59 +# 小控件 +MOGO_MODULE_WIDGETS_VERSION=2.0.59 +# obu +MOGO_MODULE_OBU_VERSION=2.0.59 +MOGO_MODULE_OBU_MOGO_VERSION=2.0.59 +# monitor +MOGO_MODULE_MONITOR_VERSION=2.0.59 +# bugly +CRASHREPORT_VERSION=2.0.59 +CRASHREPORT_BUGLY_VERSION=2.0.59 +CRASHREPORT_NOOP_VERSION=2.0.59 +CRASHREPORT_UPGRADE_VERSION=2.0.59 +## tts +TTS_BASE_VERSION=2.0.59 +TTS_DI_VERSION=2.0.59 +TTS_ZHI_VERSION=2.0.59 +TTS_PAD_VERSION=2.0.59 +TTS_NOOP_VERSION=2.0.59 +# 自研地图 +MAP_CUSTOM_VERSION=2.0.59 +MOGO_MODULE_ADAS_VERSION=2.0.59 +# 基础服务实现：passport、socket、location +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.59 +MOGO_BASE_SERVICES_APK_VERSION=2.0.59 +MOGO_BASE_SERVICES_SDK_VERSION=2.0.59 +MOGO_MODULE_CHAT_VERSION=2.0.59 +# 车聊聊 +MOGO_MODULE_CARCHATTING_VERSION=2.0.59 +# 车聊聊接口 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.0.59 +# websocket +WEBSOCKET_VERSION=1.1.7 + +# 皮肤 +MOGO_SKIN_SUPPORT_VERSION=2.0.59 +MOGO_SKIN_LIGHT_VERSION=2.0.59 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.59 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.59 +SKIN_SUPPORT_VERSION=2.0.59 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.59 +SKIN_SUPPORT_CARDVIEW_VERSION=2.0.59 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.59 +SKIN_SUPPORT_DESIGN_VERSION=2.0.59 +# 闪屏页 +MOGO_MODULE_SPLASH_VERSION=2.0.59 +MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.59 +################# 旧版本架构模块版本 ################# diff --git a/libraries/map-autonavi/build.gradle b/libraries/map-autonavi/build.gradle index 41c65a0ab3..5faeee0bc5 100644 --- a/libraries/map-autonavi/build.gradle +++ b/libraries/map-autonavi/build.gradle @@ -51,6 +51,8 @@ dependencies { implementation rootProject.ext.dependencies.mogomapapi implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.mogomapapi + + implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(':foudations:mogo-utils') implementation project(':libraries:mogo-map-api') diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index e0d484d9d3..dfad79a71e 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -64,6 +64,10 @@ dependencies { implementation rootProject.ext.dependencies.mogoutils implementation rootProject.ext.dependencies.mogomapapi implementation rootProject.ext.dependencies.mogocommons + + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_function_call + } else { implementation project(':foudations:mogo-utils') implementation project(':libraries:mogo-map-api') diff --git a/libraries/mogo-map-api/build.gradle b/libraries/mogo-map-api/build.gradle index cedaa041fb..53f84c974e 100644 --- a/libraries/mogo-map-api/build.gradle +++ b/libraries/mogo-map-api/build.gradle @@ -50,6 +50,8 @@ dependencies { if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogoutils + + implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(':foudations:mogo-utils') implementation project(':core:mogo-core-data') diff --git a/libraries/mogo-map/build.gradle b/libraries/mogo-map/build.gradle index 08c76a948a..80864af651 100644 --- a/libraries/mogo-map/build.gradle +++ b/libraries/mogo-map/build.gradle @@ -47,6 +47,9 @@ dependencies { implementation rootProject.ext.dependencies.mogomapapi api rootProject.ext.dependencies.mapautomap implementation rootProject.ext.dependencies.mogocommons + + implementation rootProject.ext.dependencies.mogo_core_data + } else { implementation project(':foudations:mogo-utils') implementation project(':libraries:mogo-map-api') diff --git a/main-extensions/mogo-module-main-launcher/build.gradle b/main-extensions/mogo-module-main-launcher/build.gradle index 077d93ef3f..d999bdba42 100644 --- a/main-extensions/mogo-module-main-launcher/build.gradle +++ b/main-extensions/mogo-module-main-launcher/build.gradle @@ -54,7 +54,7 @@ dependencies { api rootProject.ext.dependencies.modulemain implementation rootProject.ext.dependencies.mogooch implementation rootProject.ext.dependencies.moduleservice - implementation rootProject.ext.dependencies.moduleSmallMap + implementation rootProject.ext.dependencies.mogo_core_function_smp } else { api project(":modules:mogo-module-main") implementation project(":OCH:mogo-och") diff --git a/modules-back.txt b/modules-back.txt new file mode 100644 index 0000000000..aa5f38f32b --- /dev/null +++ b/modules-back.txt @@ -0,0 +1,52 @@ +:modules:mogo-module-data +:foudations:mogo-utils +:skin:mogo-skin-support +:tts:tts-base +:tts:tts-zhi +:tts:tts-pad +:libraries:mogo-map-api +:services:mogo-service-api +:foudations:mogo-aicloud-services-sdk +:foudations:mogo-commons +:tts:tts-di +:tts:tts-noop +:skin:skin-support +:skin:skin-support-appcompat +:skin:skin-support-cardview +:skin:skin-support-constraint-layout +:skin:skin-support-design +:libraries:map-autonavi +:libraries:map-custom +:libraries:mogo-map +:modules:mogo-module-common +:skin:mogo-skin-support-impl +:skin:mogo-skin-support-noop +:test:crashreport +:test:crashreport-bugly +:test:crashreport-noop +:test:crashreport-upgrade +:skin:mogo-skin-light +:modules:mogo-module-obu +:core:function-impl:mogo-core-function-obu-mogo +:modules:mogo-module-adas +:services:mogo-service +:modules:mogo-module-map +:core:function-impl:mogo-core-function-smp +:modules:mogo-module-apps +:modules:mogo-module-service +:modules:mogo-module-share +:modules:mogo-module-extensions +:modules:mogo-module-v2x +:modules:mogo-module-back +:modules:mogo-module-main +:OCH:mogo-och +:OCH:mogo-och-bus +:OCH:mogo-och-noop +:OCH:mogo-och-taxi +:main-extensions:mogo-module-main-launcher +:modules:mogo-module-push-base +:modules:mogo-module-push-noop +:modules:mogo-module-push +:libraries:tanlulib +:modules:mogo-module-monitor +:modules:mogo-module-hmi \ No newline at end of file diff --git a/modules.txt b/modules.txt index 9285f1a6db..5992f73bee 100644 --- a/modules.txt +++ b/modules.txt @@ -1,6 +1,10 @@ -:modules:mogo-module-data +:core:mogo-core-utils +:core:mogo-core-res +:core:mogo-core-data +:core:mogo-core-network +:core:mogo-core-function-api +:core:mogo-core-function-call :foudations:mogo-utils -:skin:mogo-skin-support :tts:tts-base :tts:tts-zhi :tts:tts-pad @@ -10,31 +14,26 @@ :foudations:mogo-commons :tts:tts-di :tts:tts-noop -:skin:skin-support -:skin:skin-support-appcompat -:skin:skin-support-cardview -:skin:skin-support-constraint-layout -:skin:skin-support-design :libraries:map-autonavi :libraries:map-custom :libraries:mogo-map +:modules:mogo-module-carchattingprovider :modules:mogo-module-common -:skin:mogo-skin-support-impl -:skin:mogo-skin-support-noop +:modules:mogo-module-chat +:modules:mogo-module-carchatting :test:crashreport :test:crashreport-bugly :test:crashreport-noop :test:crashreport-upgrade -:skin:mogo-skin-light :modules:mogo-module-obu :core:function-impl:mogo-core-function-obu-mogo :modules:mogo-module-adas +:modules:mogo-module-service +:core:function-impl:mogo-core-function-check :services:mogo-service :modules:mogo-module-map :core:function-impl:mogo-core-function-smp :modules:mogo-module-apps -:modules:mogo-module-service -:modules:mogo-module-authorize :modules:mogo-module-share :modules:mogo-module-extensions :modules:mogo-module-v2x @@ -48,6 +47,12 @@ :modules:mogo-module-push-base :modules:mogo-module-push-noop :modules:mogo-module-push -:libraries:tanlulib +:modules:tanlulib :modules:mogo-module-monitor -:modules:mogo-module-hmi \ No newline at end of file +:modules:mogo-module-widgets +:core:function-impl:mogo-core-function-autopilot +:core:function-impl:mogo-core-function-hmi +:core:function-impl:mogo-core-function-map +:core:function-impl:mogo-core-function-monitoring +:core:function-impl:mogo-core-function-notice +:core:function-impl:mogo-core-function-v2x \ No newline at end of file diff --git a/modules/mogo-module-adas/build.gradle b/modules/mogo-module-adas/build.gradle index 83c2372740..bf3db4889d 100644 --- a/modules/mogo-module-adas/build.gradle +++ b/modules/mogo-module-adas/build.gradle @@ -59,6 +59,11 @@ dependencies { api rootProject.ext.dependencies.mogocommons api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon + + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_function_api + implementation rootProject.ext.dependencies.mogo_core_function_call } else { api project(":foudations:mogo-utils") api project(":foudations:mogo-commons") diff --git a/modules/mogo-module-apps/build.gradle b/modules/mogo-module-apps/build.gradle index 42eb26e4a6..4cea97b00a 100644 --- a/modules/mogo-module-apps/build.gradle +++ b/modules/mogo-module-apps/build.gradle @@ -61,6 +61,8 @@ dependencies { api rootProject.ext.dependencies.mogocommons api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon + + implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(":libraries:mogo-map-api") implementation project(":foudations:mogo-utils") diff --git a/modules/mogo-module-back/build.gradle b/modules/mogo-module-back/build.gradle index 37537d4b72..31f6742f6c 100644 --- a/modules/mogo-module-back/build.gradle +++ b/modules/mogo-module-back/build.gradle @@ -57,6 +57,8 @@ dependencies { implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon + + implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(":foudations:mogo-utils") implementation project(":foudations:mogo-commons") diff --git a/modules/mogo-module-carchatting/build.gradle b/modules/mogo-module-carchatting/build.gradle index 57a5610c2b..d49cd4ceb3 100644 --- a/modules/mogo-module-carchatting/build.gradle +++ b/modules/mogo-module-carchatting/build.gradle @@ -74,6 +74,9 @@ dependencies { compileOnly rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.chat + + implementation rootProject.ext.dependencies.mogo_core_data + } else { compileOnly project(':modules:mogo-module-carchattingprovider') diff --git a/modules/mogo-module-chat/build.gradle b/modules/mogo-module-chat/build.gradle index cf0624b9d6..faf9f49773 100644 --- a/modules/mogo-module-chat/build.gradle +++ b/modules/mogo-module-chat/build.gradle @@ -80,22 +80,22 @@ dependencies { if (Boolean.valueOf(RELEASE)) { - compileOnly rootProject.ext.dependencies.mogomap - compileOnly rootProject.ext.dependencies.mogoutils - compileOnly rootProject.ext.dependencies.mogocommons - compileOnly rootProject.ext.dependencies.mogoserviceapi - compileOnly rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.mogomap + implementation rootProject.ext.dependencies.mogoutils + implementation rootProject.ext.dependencies.mogocommons + implementation rootProject.ext.dependencies.mogoserviceapi + implementation rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.mogo_core_data } else { - api project(":libraries:mogo-map") - api project(":foudations:mogo-utils") - api project(":foudations:mogo-commons") - api project(':services:mogo-service-api') + implementation project(":libraries:mogo-map") + implementation project(":foudations:mogo-utils") + implementation project(":foudations:mogo-commons") + implementation project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') implementation project(':core:mogo-core-data') - } } diff --git a/modules/mogo-module-common/build.gradle b/modules/mogo-module-common/build.gradle index 7ed0cf732a..54999e24cb 100644 --- a/modules/mogo-module-common/build.gradle +++ b/modules/mogo-module-common/build.gradle @@ -67,6 +67,8 @@ dependencies { implementation rootProject.ext.dependencies.mogoobu + annotationProcessor 'com.elegant.spi:compiler:1.0.3' + if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogomap api rootProject.ext.dependencies.mogomapapi @@ -75,6 +77,8 @@ dependencies { api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.callchatprovider + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_function_call } else { api project(":libraries:mogo-map") api project(":libraries:mogo-map-api") @@ -83,15 +87,10 @@ dependencies { api project(':services:mogo-service-api') implementation project(':modules:mogo-module-carchattingprovider') - implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-function-call') } -// implementation rootProject.ext.dependencies.mogochainbase -// implementation rootProject.ext.dependencies.mogochainplugin - - annotationProcessor 'com.elegant.spi:compiler:1.0.3' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle index e4b3761eba..7ff7d038db 100644 --- a/modules/mogo-module-extensions/build.gradle +++ b/modules/mogo-module-extensions/build.gradle @@ -70,6 +70,10 @@ dependencies { implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.moduleshare implementation rootProject.ext.dependencies.moduleservice + + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_res + implementation rootProject.ext.dependencies.mogo_core_function_call } else { api project(":libraries:mogo-map-api") api project(":foudations:mogo-utils") diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle index b030da08ef..47a2d79973 100644 --- a/modules/mogo-module-main/build.gradle +++ b/modules/mogo-module-main/build.gradle @@ -60,17 +60,17 @@ dependencies { api rootProject.ext.dependencies.moduleservice implementation rootProject.ext.dependencies.callchatprovider + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_function_call } else { api project(":foudations:mogo-utils") api project(":foudations:mogo-commons") api project(':modules:mogo-module-common') api project(':services:mogo-service-api') api project(':services:mogo-service') - implementation project(':modules:mogo-module-carchattingprovider') implementation project(':core:mogo-core-data') - implementation project(':core:mogo-core-function-call') } } diff --git a/modules/mogo-module-map/build.gradle b/modules/mogo-module-map/build.gradle index 65c0193776..05c6628289 100644 --- a/modules/mogo-module-map/build.gradle +++ b/modules/mogo-module-map/build.gradle @@ -57,6 +57,8 @@ dependencies { api rootProject.ext.dependencies.mogocommons api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon + + implementation rootProject.ext.dependencies.mogo_core_data } else { api project(":libraries:mogo-map") api project(":libraries:mogo-map-api") @@ -66,7 +68,6 @@ dependencies { implementation project(':modules:mogo-module-common') implementation project(':core:mogo-core-data') - } } diff --git a/modules/mogo-module-obu/build.gradle b/modules/mogo-module-obu/build.gradle index 4fae4a7628..547a20fa16 100644 --- a/modules/mogo-module-obu/build.gradle +++ b/modules/mogo-module-obu/build.gradle @@ -46,6 +46,7 @@ dependencies { if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(':modules:mogo-module-common') implementation project(':core:mogo-core-data') diff --git a/modules/mogo-module-push/build.gradle b/modules/mogo-module-push/build.gradle index bee5da857d..5bd1688372 100644 --- a/modules/mogo-module-push/build.gradle +++ b/modules/mogo-module-push/build.gradle @@ -68,6 +68,8 @@ dependencies { implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.mogoserviceapi + + implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(":modules:mogo-module-push-base") implementation project(':foudations:mogo-utils') diff --git a/modules/mogo-module-service/build.gradle b/modules/mogo-module-service/build.gradle index 6b45839503..8588728bcf 100644 --- a/modules/mogo-module-service/build.gradle +++ b/modules/mogo-module-service/build.gradle @@ -61,6 +61,10 @@ dependencies { implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.callchatprovider + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_res + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_function_call } else { implementation project(":libraries:mogo-map") implementation project(":libraries:mogo-map-api") diff --git a/modules/mogo-module-share/build.gradle b/modules/mogo-module-share/build.gradle index b7abc34950..c241590cad 100644 --- a/modules/mogo-module-share/build.gradle +++ b/modules/mogo-module-share/build.gradle @@ -58,8 +58,9 @@ dependencies { implementation rootProject.ext.dependencies.mogoutils implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.modulecommon - implementation rootProject.ext.dependencies.mogomoduleauth implementation rootProject.ext.dependencies.moduleservice + + implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(":foudations:mogo-utils") implementation project(":foudations:mogo-commons") diff --git a/modules/mogo-module-v2x/build.gradle b/modules/mogo-module-v2x/build.gradle index 61a7182ac6..06f9343dd9 100644 --- a/modules/mogo-module-v2x/build.gradle +++ b/modules/mogo-module-v2x/build.gradle @@ -82,6 +82,10 @@ dependencies { implementation rootProject.ext.dependencies.moduleobu implementation rootProject.ext.dependencies.callchatprovider + implementation rootProject.ext.dependencies.mogo_core_res + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_function_call } else { implementation project(':libraries:mogo-map') implementation project(':foudations:mogo-utils') diff --git a/modules/tanlulib/build.gradle b/modules/tanlulib/build.gradle index 065e652fe6..ba660ef3b4 100644 --- a/modules/tanlulib/build.gradle +++ b/modules/tanlulib/build.gradle @@ -79,13 +79,15 @@ dependencies { implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.mogomap implementation rootProject.ext.dependencies.mogoserviceapi + + implementation rootProject.ext.dependencies.mogo_core_data } else { implementation project(":foudations:mogo-utils") implementation project(':modules:mogo-module-common') implementation project(':libraries:mogo-map') implementation project(':services:mogo-service-api') - implementation project(':core:mogo-core-data') + implementation project(':core:mogo-core-data') } } diff --git a/services/mogo-service-api/build.gradle b/services/mogo-service-api/build.gradle index 992639b8c4..374bfc4eca 100644 --- a/services/mogo-service-api/build.gradle +++ b/services/mogo-service-api/build.gradle @@ -55,13 +55,14 @@ dependencies { if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogomapapi - api rootProject.ext.dependencies.skinsupport - implementation rootProject.ext.dependencies.moduledata + + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_function_api } else { api project(":libraries:mogo-map-api") -// api project(":skin:mogo-skin-support") - api project(':core:mogo-core-function-api') + implementation project(':core:mogo-core-data') + api project(':core:mogo-core-function-api') } } diff --git a/services/mogo-service/build.gradle b/services/mogo-service/build.gradle index 84b214cfbe..a8708a720c 100644 --- a/services/mogo-service/build.gradle +++ b/services/mogo-service/build.gradle @@ -58,7 +58,9 @@ dependencies { implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.moduleADAS - implementation rootProject.ext.dependencies.mogomodulecheck + + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_function_check } else { implementation project(':modules:mogo-module-adas') api project(":libraries:mogo-map")