From 86950992380f1c99b05ea854ff54d77a99cace8d Mon Sep 17 00:00:00 2001 From: donghongyu Date: Mon, 15 Nov 2021 22:41:55 +0800 Subject: [PATCH] =?UTF-8?q?[Add]=20=E5=8F=91=E5=B8=83=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=ACmaven=202.0.70=200.0.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- ZD_README/README_VersionHistory.md | 1 - app/build.gradle | 1 - config.gradle | 1 - .../mogo-core-function-check/build.gradle | 2 +- gradle.properties | 163 +++++++++--------- 5 files changed, 82 insertions(+), 86 deletions(-) diff --git a/ZD_README/README_VersionHistory.md b/ZD_README/README_VersionHistory.md index 54fd2203a4..4c27ee5b85 100644 --- a/ZD_README/README_VersionHistory.md +++ b/ZD_README/README_VersionHistory.md @@ -52,7 +52,6 @@ mogocustommap : "com.zhidaoauto.machine:map:${MOGO_COMMONS_VERSIO modulecommon : "com.mogo.module:module-common:${MOGO_COMMONS_VERSION}", modulemain : "com.mogo.module:module-main:${MOGO_COMMONS_VERSION}", -modulemainlauncher : "com.mogo.module:module-main-launcher:${MOGO_COMMONS_VERSION}", modulemap : "com.mogo.module:module-map:${MOGO_COMMONS_VERSION}", moduleservice : "com.mogo.module:module-service:${MOGO_COMMONS_VERSION}", mogoservice : "com.mogo.service:mogo-service:${MOGO_COMMONS_VERSION}", diff --git a/app/build.gradle b/app/build.gradle index e83aa23e4c..e520b1a779 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -176,7 +176,6 @@ dependencies { implementation rootProject.ext.dependencies.mogomodulewidgets implementation rootProject.ext.dependencies.moduleADAS implementation rootProject.ext.dependencies.mogomoduleback - implementation rootProject.ext.dependencies.modulemainlauncher implementation rootProject.ext.dependencies.moduleapps implementation rootProject.ext.dependencies.modulepushbase implementation rootProject.ext.dependencies.modulepush diff --git a/config.gradle b/config.gradle index 5e2395b4d1..c8a8db0f31 100644 --- a/config.gradle +++ b/config.gradle @@ -147,7 +147,6 @@ ext { modulecommon : "com.mogo.module:module-common:${MOGO_MODULE_COMMON_VERSION}", modulemain : "com.mogo.module:module-main:${MOGO_MODULE_MAIN_VERSION}", - modulemainlauncher : "com.mogo.module:module-main-launcher:${MOGO_MODULE_MAIN_LAUNCHER_VERSION}", modulemap : "com.mogo.module:module-map:${MOGO_MODULE_MAP_VERSION}", moduleservice : "com.mogo.module:module-service:${MOGO_MODULE_SERVICE_VERSION}", mogoservice : "com.mogo.service:mogo-service:${MOGO_SERVICE_VERSION}", diff --git a/core/function-impl/mogo-core-function-check/build.gradle b/core/function-impl/mogo-core-function-check/build.gradle index 689b9d6a93..1ef065fdce 100644 --- a/core/function-impl/mogo-core-function-check/build.gradle +++ b/core/function-impl/mogo-core-function-check/build.gradle @@ -56,8 +56,8 @@ dependencies { implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.mogoserviceapi - implementation rootProject.ext.dependencies.moduleservice implementation rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.moduleservice implementation rootProject.ext.dependencies.callchatprovider implementation rootProject.ext.dependencies.mogo_core_data diff --git a/gradle.properties b/gradle.properties index 7fcb77ce09..2167d649d5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,14 +37,14 @@ 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.67.aar +android.jetifier.blacklist=module-service-2.0.70.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -USE_MAVEN_PACKAGE=false +USE_MAVEN_PACKAGE=true ##plugin 插件 #android.enableR8.libraries=false #android.enableR8=false @@ -88,103 +88,102 @@ applicationName=IntelligentPilot versionCode=80007 versionName=8.0.14 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.10 -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.10 -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.10 -MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.10 -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.10 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.10 -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.10 -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.10 -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.10 -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.10 -MOGO_CORE_DATA_VERSION=0.0.10 -MOGO_CORE_FUNCTION_API_VERSION=0.0.10 -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.10 -MOGO_CORE_RES_VERSION=0.0.10 -MOGO_CORE_UTILS_VERSION=0.0.10 -MOGO_CORE_NETWORK_VERSION=0.0.10 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.13 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.13 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.13 +MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.13 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.13 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.13 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.13 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.13 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.13 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.13 +MOGO_CORE_DATA_VERSION=0.0.13 +MOGO_CORE_FUNCTION_API_VERSION=0.0.13 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.13 +MOGO_CORE_RES_VERSION=0.0.13 +MOGO_CORE_UTILS_VERSION=0.0.13 +MOGO_CORE_NETWORK_VERSION=0.0.13 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.0.67 -MOGO_UTILS_VERSION=2.0.67 -MAP_AMAP_VERSION=2.0.67 -MAP_AUTONAVI_VERSION=2.0.67 -MOGO_MAP_VERSION=2.0.67 -MOGO_MAP_API_VERSION=2.0.67 -MOGO_SERVICE_VERSION=2.0.67 -MOGO_SERVICE_API_VERSION=2.0.67 -MOGO_CONNECTION_VERSION=2.0.67 -MOGO_MODULE_APPS_VERSION=2.0.67 -MOGO_MODULE_NAVI_VERSION=2.0.67 -MOGO_MODULE_SHARE_VERSION=2.0.67 -MOGO_MODULE_COMMON_VERSION=2.0.67 -MOGO_MODULE_MAIN_VERSION=2.0.67 -MOGO_MODULE_MAP_VERSION=2.0.67 -MOGO_MODULE_SERVICE_VERSION=2.0.67 -MOGO_MODULE_EXTENSIONS_VERSION=2.0.67 -MOGO_MODULE_SEARCH_VERSION=2.0.67 -MOGO_MODULE_BACK_VERSION=2.0.67 -MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.67 -MOGO_MODULE_V2X_VERSION=2.0.67 +MOGO_COMMONS_VERSION=2.0.70 +MOGO_UTILS_VERSION=2.0.70 +MAP_AMAP_VERSION=2.0.70 +MAP_AUTONAVI_VERSION=2.0.70 +MOGO_MAP_VERSION=2.0.70 +MOGO_MAP_API_VERSION=2.0.70 +MOGO_SERVICE_VERSION=2.0.70 +MOGO_SERVICE_API_VERSION=2.0.70 +MOGO_CONNECTION_VERSION=2.0.70 +MOGO_MODULE_APPS_VERSION=2.0.70 +MOGO_MODULE_NAVI_VERSION=2.0.70 +MOGO_MODULE_SHARE_VERSION=2.0.70 +MOGO_MODULE_COMMON_VERSION=2.0.70 +MOGO_MODULE_MAIN_VERSION=2.0.70 +MOGO_MODULE_MAP_VERSION=2.0.70 +MOGO_MODULE_SERVICE_VERSION=2.0.70 +MOGO_MODULE_EXTENSIONS_VERSION=2.0.70 +MOGO_MODULE_SEARCH_VERSION=2.0.70 +MOGO_MODULE_BACK_VERSION=2.0.70 +MOGO_MODULE_V2X_VERSION=2.0.70 # 探路 -MOGO_MODULE_TANLU_VERSION=2.0.67 +MOGO_MODULE_TANLU_VERSION=2.0.70 # 推送 -MOGO_MODULE_PUSH_VERSION=2.0.67 -MOGO_MODULE_PUSH_BASE_VERSION=2.0.67 -MOGO_MODULE_PUSH_NOOP_VERSION=2.0.67 +MOGO_MODULE_PUSH_VERSION=2.0.70 +MOGO_MODULE_PUSH_BASE_VERSION=2.0.70 +MOGO_MODULE_PUSH_NOOP_VERSION=2.0.70 # 探路上报和分享模块 -TANLULIB_VERSION=2.0.67 -MOGO_TANLU_API_VERSION=2.0.67 +TANLULIB_VERSION=2.0.70 +MOGO_TANLU_API_VERSION=2.0.70 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.0.67 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.67 +MOGO_MODULE_LEFT_PANEL_VERSION=2.0.70 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.70 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.0.67 +MOGO_MODULE_WIDGETS_VERSION=2.0.70 # obu -MOGO_MODULE_OBU_VERSION=2.0.67 -MOGO_MODULE_OBU_MOGO_VERSION=2.0.67 +MOGO_MODULE_OBU_VERSION=2.0.70 +MOGO_MODULE_OBU_MOGO_VERSION=2.0.70 # monitor -MOGO_MODULE_MONITOR_VERSION=2.0.67 +MOGO_MODULE_MONITOR_VERSION=2.0.70 # bugly -CRASHREPORT_VERSION=2.0.67 -CRASHREPORT_BUGLY_VERSION=2.0.67 -CRASHREPORT_NOOP_VERSION=2.0.67 -CRASHREPORT_UPGRADE_VERSION=2.0.67 +CRASHREPORT_VERSION=2.0.70 +CRASHREPORT_BUGLY_VERSION=2.0.70 +CRASHREPORT_NOOP_VERSION=2.0.70 +CRASHREPORT_UPGRADE_VERSION=2.0.70 ## tts -TTS_BASE_VERSION=2.0.67 -TTS_DI_VERSION=2.0.67 -TTS_ZHI_VERSION=2.0.67 -TTS_PAD_VERSION=2.0.67 -TTS_NOOP_VERSION=2.0.67 +TTS_BASE_VERSION=2.0.70 +TTS_DI_VERSION=2.0.70 +TTS_ZHI_VERSION=2.0.70 +TTS_PAD_VERSION=2.0.70 +TTS_NOOP_VERSION=2.0.70 # 自研地图 -MAP_CUSTOM_VERSION=2.0.67 -MOGO_MODULE_ADAS_VERSION=2.0.67 +MAP_CUSTOM_VERSION=2.0.70 +MOGO_MODULE_ADAS_VERSION=2.0.70 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.67 -MOGO_BASE_SERVICES_APK_VERSION=2.0.67 -MOGO_BASE_SERVICES_SDK_VERSION=2.0.67 -MOGO_MODULE_CHAT_VERSION=2.0.67 +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.70 +MOGO_BASE_SERVICES_APK_VERSION=2.0.70 +MOGO_BASE_SERVICES_SDK_VERSION=2.0.70 +MOGO_MODULE_CHAT_VERSION=2.0.70 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.0.67 +MOGO_MODULE_CARCHATTING_VERSION=2.0.70 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.0.67 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.0.70 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.0.67 -MOGO_SKIN_LIGHT_VERSION=2.0.67 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.67 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.67 -SKIN_SUPPORT_VERSION=2.0.67 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.67 -SKIN_SUPPORT_CARDVIEW_VERSION=2.0.67 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.67 -SKIN_SUPPORT_DESIGN_VERSION=2.0.67 +MOGO_SKIN_SUPPORT_VERSION=2.0.70 +MOGO_SKIN_LIGHT_VERSION=2.0.70 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.70 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.70 +SKIN_SUPPORT_VERSION=2.0.70 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.70 +SKIN_SUPPORT_CARDVIEW_VERSION=2.0.70 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.70 +SKIN_SUPPORT_DESIGN_VERSION=2.0.70 # OCH -MOGO_OCH_VERSION=2.0.67-test -MOGO_OCH_BUS_VERSION=2.0.67-test -MOGO_OCH_NOOP_VERSION=2.0.67-test -MOGO_OCH_TAXI_VERSION=2.0.67-test +MOGO_OCH_VERSION=2.0.70-test +MOGO_OCH_BUS_VERSION=2.0.70-test +MOGO_OCH_NOOP_VERSION=2.0.70-test +MOGO_OCH_TAXI_VERSION=2.0.70-test # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.67 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.70 ################# 旧版本架构模块版本 #################