yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Change]

Browse Source 
解决上传maven问题

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2022-02-11 17:28:06 +08:00
parent 4ebb696de6
commit a11504daf7
9 changed files with 86 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.gradle
View File

@@ -225,7 +225,7 @@ ext {
//========================= 新架构的 Maven 版本管理 =========================
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_devatools : "com.mogo.eagle.core.function.impl:devatools:${MOGO_CORE_FUNCTION_CHECK_VERSION}",
mogo_core_function_devatools : "com.mogo.eagle.core.function.impl:devatools:${MOGO_CORE_FUNCTION_DEVATOOLS_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_main : "com.mogo.eagle.core.function.impl:main:${MOGO_CORE_FUNCTION_MAIN_VERSION}",

1
core/function-impl/mogo-core-function-main/build.gradle
View File

@@ -68,7 +68,6 @@ dependencies {
api rootProject.ext.dependencies.mogocommons
api rootProject.ext.dependencies.modulecommon
api rootProject.ext.dependencies.mogoservice
api rootProject.ext.dependencies.moduleshare
api rootProject.ext.dependencies.moduleextensions
api rootProject.ext.dependencies.callchat
api rootProject.ext.dependencies.callchatprovider

157
gradle.properties
View File

@@ -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.1.16.8.aar
android.jetifier.blacklist=module-service-2.1.16.10.aar
## maven 配置
RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/
SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
@@ -91,105 +91,106 @@ versionCode=80008
versionName=2.5.1
################# 新架构模块Maven版本管理 #################
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.58.8
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.58.8
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.8
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.58.8
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.58.8
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.58.8
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.58.8
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.58.8
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.58.8
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.58.8
MOGO_CORE_DATA_VERSION=0.0.58.8
MOGO_CORE_FUNCTION_API_VERSION=0.0.58.8
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.58.8
MOGO_CORE_RES_VERSION=0.0.58.8
MOGO_CORE_UTILS_VERSION=0.0.58.8
MOGO_CORE_NETWORK_VERSION=0.0.58.8
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.58.10
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.58.10
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.58.10
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.58.10
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.58.10
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.58.10
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.58.10
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.58.10
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.58.10
MOGO_CORE_DATA_VERSION=0.0.58.10
MOGO_CORE_FUNCTION_API_VERSION=0.0.58.10
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.58.10
MOGO_CORE_FUNCTION_DEVATOOLS_VERSION=0.0.58.10
MOGO_CORE_RES_VERSION=0.0.58.10
MOGO_CORE_UTILS_VERSION=0.0.58.10
MOGO_CORE_NETWORK_VERSION=0.0.58.10
################# 旧版本架构模块版本 #################
## 工程内模块
MOGO_COMMONS_VERSION=2.1.16.8
MOGO_UTILS_VERSION=2.1.16.8
MAP_AMAP_VERSION=2.1.16.8
MAP_AUTONAVI_VERSION=2.1.16.8
MOGO_MAP_VERSION=2.1.16.8
MOGO_MAP_API_VERSION=2.1.16.8
MOGO_SERVICE_VERSION=2.1.16.8
MOGO_SERVICE_API_VERSION=2.1.16.8
MOGO_CONNECTION_VERSION=2.1.16.8
MOGO_MODULE_APPS_VERSION=2.1.16.8
MOGO_MODULE_NAVI_VERSION=2.1.16.8
MOGO_MODULE_SHARE_VERSION=2.1.16.8
MOGO_MODULE_COMMON_VERSION=2.1.16.8
MOGO_MODULE_MAIN_VERSION=2.1.16.8
MOGO_MODULE_MAP_VERSION=2.1.16.8
MOGO_MODULE_SERVICE_VERSION=2.1.16.8
MOGO_MODULE_EXTENSIONS_VERSION=2.1.16.8
MOGO_MODULE_SEARCH_VERSION=2.1.16.8
MOGO_MODULE_BACK_VERSION=2.1.16.8
MOGO_MODULE_V2X_VERSION=2.1.16.8
MOGO_COMMONS_VERSION=2.1.16.10
MOGO_UTILS_VERSION=2.1.16.10
MAP_AMAP_VERSION=2.1.16.10
MAP_AUTONAVI_VERSION=2.1.16.10
MOGO_MAP_VERSION=2.1.16.10
MOGO_MAP_API_VERSION=2.1.16.10
MOGO_SERVICE_VERSION=2.1.16.10
MOGO_SERVICE_API_VERSION=2.1.16.10
MOGO_CONNECTION_VERSION=2.1.16.10
MOGO_MODULE_APPS_VERSION=2.1.16.10
MOGO_MODULE_NAVI_VERSION=2.1.16.10
MOGO_MODULE_SHARE_VERSION=2.1.16.10
MOGO_MODULE_COMMON_VERSION=2.1.16.10
MOGO_MODULE_MAIN_VERSION=2.1.16.10
MOGO_MODULE_MAP_VERSION=2.1.16.10
MOGO_MODULE_SERVICE_VERSION=2.1.16.10
MOGO_MODULE_EXTENSIONS_VERSION=2.1.16.10
MOGO_MODULE_SEARCH_VERSION=2.1.16.10
MOGO_MODULE_BACK_VERSION=2.1.16.10
MOGO_MODULE_V2X_VERSION=2.1.16.10
# 探路
MOGO_MODULE_TANLU_VERSION=2.1.16.8
MOGO_MODULE_TANLU_VERSION=2.1.16.10
# 推送
MOGO_MODULE_PUSH_VERSION=2.1.16.8
MOGO_MODULE_PUSH_BASE_VERSION=2.1.16.8
MOGO_MODULE_PUSH_NOOP_VERSION=2.1.16.8
MOGO_MODULE_PUSH_VERSION=2.1.16.10
MOGO_MODULE_PUSH_BASE_VERSION=2.1.16.10
MOGO_MODULE_PUSH_NOOP_VERSION=2.1.16.10
# 探路上报和分享模块
TANLULIB_VERSION=2.1.16.8
MOGO_TANLU_API_VERSION=2.1.16.8
TANLULIB_VERSION=2.1.16.10
MOGO_TANLU_API_VERSION=2.1.16.10
#左侧面板模块
MOGO_MODULE_LEFT_PANEL_VERSION=2.1.16.8
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.16.8
MOGO_MODULE_LEFT_PANEL_VERSION=2.1.16.10
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.16.10
# 小控件
MOGO_MODULE_WIDGETS_VERSION=2.1.16.8
MOGO_MODULE_WIDGETS_VERSION=2.1.16.10
# obu
MOGO_MODULE_OBU_VERSION=2.1.16.8
MOGO_MODULE_OBU_MOGO_VERSION=2.1.16.8
MOGO_MODULE_OBU_VERSION=2.1.16.10
MOGO_MODULE_OBU_MOGO_VERSION=2.1.16.10
# monitor
MOGO_MODULE_MONITOR_VERSION=2.1.16.8
MOGO_MODULE_MONITOR_VERSION=2.1.16.10
# bugly
CRASHREPORT_VERSION=2.1.16.8
CRASHREPORT_BUGLY_VERSION=2.1.16.8
CRASHREPORT_NOOP_VERSION=2.1.16.8
CRASHREPORT_APMBYTE_VERSION=2.1.16.8
CRASHREPORT_UPGRADE_VERSION=2.1.16.8
CRASHREPORT_VERSION=2.1.16.10
CRASHREPORT_BUGLY_VERSION=2.1.16.10
CRASHREPORT_NOOP_VERSION=2.1.16.10
CRASHREPORT_APMBYTE_VERSION=2.1.16.10
CRASHREPORT_UPGRADE_VERSION=2.1.16.10
## tts
TTS_BASE_VERSION=2.1.16.8
TTS_DI_VERSION=2.1.16.8
TTS_ZHI_VERSION=2.1.16.8
TTS_PAD_VERSION=2.1.16.8
TTS_NOOP_VERSION=2.1.16.8
TTS_BASE_VERSION=2.1.16.10
TTS_DI_VERSION=2.1.16.10
TTS_ZHI_VERSION=2.1.16.10
TTS_PAD_VERSION=2.1.16.10
TTS_NOOP_VERSION=2.1.16.10
# 自研地图
MAP_CUSTOM_VERSION=2.1.16.8
MOGO_MODULE_ADAS_VERSION=2.1.16.8
MAP_CUSTOM_VERSION=2.1.16.10
MOGO_MODULE_ADAS_VERSION=2.1.16.10
# 基础服务实现：passport、socket、location
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.16.8
MOGO_BASE_SERVICES_APK_VERSION=2.1.16.8
MOGO_BASE_SERVICES_SDK_VERSION=2.1.16.8
MOGO_MODULE_CHAT_VERSION=2.1.16.8
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.16.10
MOGO_BASE_SERVICES_APK_VERSION=2.1.16.10
MOGO_BASE_SERVICES_SDK_VERSION=2.1.16.10
MOGO_MODULE_CHAT_VERSION=2.1.16.10
# 车聊聊
MOGO_MODULE_CARCHATTING_VERSION=2.1.16.8
MOGO_MODULE_CARCHATTING_VERSION=2.1.16.10
# 车聊聊接口
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.16.8
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.16.10
# 皮肤
MOGO_SKIN_SUPPORT_VERSION=2.1.16.8
MOGO_SKIN_LIGHT_VERSION=2.1.16.8
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.16.8
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.16.8
SKIN_SUPPORT_VERSION=2.1.16.8
SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.16.8
SKIN_SUPPORT_CARDVIEW_VERSION=2.1.16.8
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.16.8
SKIN_SUPPORT_DESIGN_VERSION=2.1.16.8
MOGO_SKIN_SUPPORT_VERSION=2.1.16.10
MOGO_SKIN_LIGHT_VERSION=2.1.16.10
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.16.10
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.16.10
SKIN_SUPPORT_VERSION=2.1.16.10
SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.16.10
SKIN_SUPPORT_CARDVIEW_VERSION=2.1.16.10
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.16.10
SKIN_SUPPORT_DESIGN_VERSION=2.1.16.10
# OCH
MOGO_OCH_VERSION=2.1.16.8-test
MOGO_OCH_VERSION=2.1.16.10-test
MOGO_OCH_BUS_VERSION=2.0.66
MOGO_OCH_NOOP_VERSION=2.0.66
MOGO_OCH_TAXI_VERSION=2.0.66
# mogoAiCloud sdk services
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.8
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.10
# v2x-sdk
MOGO_V2X_SDK_VERSION=1.0.1
################# 旧版本架构模块版本 #################

2
modules.txt
View File

@@ -4,7 +4,6 @@
:core:mogo-core-network
:core:mogo-core-function-api
:core:mogo-core-function-call
:foudations:mogo-utils
:tts:tts-base
:tts:tts-pad
:libraries:mogo-map-api
@@ -19,7 +18,6 @@
:modules:mogo-module-chat
:modules:mogo-module-carchatting
:test:crashreport
:test:crashreport-bugly
:test:crashreport-apm
:test:crashreport-noop
:test:crashreport-upgrade

8
modules/mogo-module-common/build.gradle
View File

@@ -73,23 +73,21 @@ dependencies {
if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
api rootProject.ext.dependencies.mogomap
api rootProject.ext.dependencies.mogomapapi
api rootProject.ext.dependencies.mogo_core_utils
api rootProject.ext.dependencies.mogocommons
api rootProject.ext.dependencies.mogoserviceapi
implementation rootProject.ext.dependencies.callchatprovider
implementation rootProject.ext.dependencies.mogo_core_utils
api rootProject.ext.dependencies.mogo_core_utils
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")
api project(':core:mogo-core-utils')
api project(":foudations:mogo-commons")
api project(':services:mogo-service-api')
implementation project(':modules:mogo-module-carchattingprovider')
implementation project(':core:mogo-core-utils')
api project(':core:mogo-core-utils')
implementation project(':core:mogo-core-data')
implementation project(':core:mogo-core-function-call')
}

6
modules/mogo-module-extensions/build.gradle
View File

@@ -64,25 +64,23 @@ dependencies {
if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
api rootProject.ext.dependencies.mogomapapi
api rootProject.ext.dependencies.mogo_core_utils
api rootProject.ext.dependencies.mogocommons
api rootProject.ext.dependencies.mogoserviceapi
implementation rootProject.ext.dependencies.modulecommon
implementation rootProject.ext.dependencies.moduleservice
implementation rootProject.ext.dependencies.mogo_core_utils
api rootProject.ext.dependencies.mogo_core_utils
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(':core:mogo-core-utils')
api project(":foudations:mogo-commons")
api project(':services:mogo-service-api')
implementation project(':modules:mogo-module-common')
implementation project(':modules:mogo-module-service')
implementation project(':core:mogo-core-utils')
api project(':core:mogo-core-utils')
implementation project(':core:mogo-core-data')
implementation project(':core:mogo-core-res')
implementation project(':core:mogo-core-function-call')

2
modules/mogo-module-main/build.gradle
View File

@@ -53,7 +53,6 @@ dependencies {
compileOnly rootProject.ext.dependencies.adasapi
compileOnly rootProject.ext.dependencies.adasconfigapi
if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
api rootProject.ext.dependencies.mogo_core_utils
api rootProject.ext.dependencies.mogocommons
api rootProject.ext.dependencies.modulecommon
api rootProject.ext.dependencies.mogoserviceapi
@@ -64,7 +63,6 @@ dependencies {
implementation rootProject.ext.dependencies.mogo_core_data
implementation rootProject.ext.dependencies.mogo_core_function_call
} else {
api project(':core:mogo-core-utils')
api project(":foudations:mogo-commons")
api project(':modules:mogo-module-common')
api project(':services:mogo-service-api')

1
services/mogo-service/build.gradle
View File

@@ -51,7 +51,6 @@ dependencies {
implementation rootProject.ext.dependencies.adasapi
implementation rootProject.ext.dependencies.adasconfigapi
if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
implementation rootProject.ext.dependencies.moduleADAS
api rootProject.ext.dependencies.mogomap
implementation rootProject.ext.dependencies.mogomapapi
implementation rootProject.ext.dependencies.mogo_core_utils

2
test/crashreport-apmbyte/build.gradle
View File

@@ -52,7 +52,7 @@ dependencies {
if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
api rootProject.ext.dependencies.crashreport
implementation rootProject.ext.dependencies.mogoutils
implementation rootProject.ext.dependencies.mogo_core_utils
implementation rootProject.ext.dependencies.mogocommons
} else {
api project(":test:crashreport")