From 43067417956cb7ca62a7ea71f7cfe6bb88e97b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 6 Sep 2021 20:41:18 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=8D=87=E7=BA=A7=E4=BA=86=E8=BD=A6?= =?UTF-8?q?=E8=81=8A=E8=81=8A=EF=BC=8C=E8=BF=98=E6=98=AF=E6=B2=A1=E8=83=BD?= =?UTF-8?q?=E8=A7=A3=E5=86=B3maven=E7=BC=96=E8=AF=91=E5=BC=82=E5=B8=B8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e685ec7d --- config.gradle | 13 +- gradle.properties | 176 ++++++++++++----------- libraries/mogo-map/build.gradle | 1 + modules/mogo-module-service/build.gradle | 28 ++-- modules/mogo-module-widgets/build.gradle | 1 + 5 files changed, 115 insertions(+), 104 deletions(-) diff --git a/config.gradle b/config.gradle index 06c729ba0e..d5439bc10d 100644 --- a/config.gradle +++ b/config.gradle @@ -1,6 +1,6 @@ ext { time = "" - kotlin_version = "1.4.31" + kotlin_version = "1.4.20" android = [ launcherApplicationId : "com.mogo.launcher", independentApplicationId : "com.mogo.launcher.app", @@ -10,7 +10,7 @@ ext { bydautoIndependentApiValue : "b1e1d527b02a493913c50985827c943a", commonLauncherAmapApiValue : "a36b9f7b086fa3951bb35338a5a06dd3", commonIndependentAmapApiValue : "1c3fbc5f5e183619ffb1e7bc01e6751f", - compileSdkVersion : 29, + compileSdkVersion : 28, buildToolsVersion : "29.0.2", minSdkVersion : 19, targetSdkVersion : 19, @@ -20,7 +20,7 @@ ext { dependencies = [ // androidx androidxappcompat : "androidx.appcompat:appcompat:1.3.1", - androidxccorektx : "androidx.core:core-ktx:1.5.0", + androidxccorektx : "androidx.core:core-ktx:1.6.0", androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:2.1.0", boostmultidex : "com.bytedance.boost_multidex:boost_multidex:1.0.1", androidxviewpager2 : "androidx.viewpager2:viewpager2:1.0.0", @@ -47,8 +47,8 @@ ext { rxjava : "io.reactivex.rxjava2:rxjava:2.2.2", rxandroid : "io.reactivex.rxjava2:rxandroid:2.1.0", // arouter - arouter : "com.alibaba:arouter-api:1.5.2", - aroutercompiler : "com.alibaba:arouter-compiler:1.5.2", + arouter : "com.alibaba:arouter-api:1.5.0", + aroutercompiler : "com.alibaba:arouter-compiler:1.2.2", // glide glide : 'com.github.bumptech.glide:glide:4.8.0', glideokhttp3 : 'com.github.bumptech.glide:okhttp3-integration:4.8.0', @@ -153,8 +153,6 @@ ext { aspectj : "org.aspectj:aspectjrt:1.8.9", - mogoaicloudservicesdk : "com.mogo.aicloud.services:services-sdk:${MOGO_AICLOUD_SERVICES_SDK_VERSION}", - // gps 模拟 gpssimulator : "com.mogo.module:module-gps-simulator:${MOGO_MODULE_GPS_SIMULATOR_VERSION}", gpssimulatordebug : "com.mogo.module:module-gps-simulator-debug:${MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION}", @@ -231,6 +229,7 @@ ext { mogoochtaxi : "com.mogo.och:och-taxi:${MOGO_OCH_TAXI_VERSION}", mogoochnoop : "com.mogo.och:och-noop:${MOGO_OCH_NOOP_VERSION}", + mogoaicloudservicesdk : "com.mogo.aicloud.services:services-sdk:${MOGO_AICLOUD_SERVICES_SDK_VERSION}", mogoaicloudsocket : "com.mogo.cloud:socket:${MOGO_SOCKET_VERSION}", mogoaicloudpassport : "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}", diff --git a/gradle.properties b/gradle.properties index 5792e482c6..59b1eb00e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,11 +31,17 @@ kapt.incremental.apt=true #kapt avoiding 如果用kapt依赖的内容没有变化，会完全重用编译内容，省掉app:kaptGenerateStubsDebugKotlin的时间 kapt.include.compile.classpath=false +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official + ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ @@ -46,101 +52,99 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=2.0.49 -MOGO_UTILS_VERSION=2.0.49 -MAP_AMAP_VERSION=2.0.49 -MAP_AUTONAVI_VERSION=2.0.49 -MOGO_MAP_VERSION=2.0.49 -MOGO_MAP_API_VERSION=2.0.49 -MOGO_SERVICE_VERSION=2.0.49 -MOGO_SERVICE_API_VERSION=2.0.49 -MOGO_CONNECTION_VERSION=2.0.49 -MOGO_MODULE_APPS_VERSION=2.0.49 -MOGO_MODULE_NAVI_VERSION=2.0.49 -MOGO_MODULE_SHARE_VERSION=2.0.49 -MOGO_MODULE_COMMON_VERSION=2.0.49 -MOGO_MODULE_MAIN_VERSION=2.0.49 -MOGO_MODULE_MAP_VERSION=2.0.49 -MOGO_MODULE_SERVICE_VERSION=2.0.49 -MOGO_MODULE_EXTENSIONS_VERSION=2.0.49 -MOGO_MODULE_SEARCH_VERSION=2.0.49 -MOGO_MODULE_BACK_VERSION=2.0.49 -MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.49 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.49 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.49 -MOGO_MODULE_AUTHORIZE_VERSION=2.0.49 -MOGO_MODULE_GUIDE_VERSION=2.0.49 -MOGO_MODULE_MEDIA_VERSION=2.0.49 -MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.49 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.49 -MOGO_MODULE_V2X_VERSION=2.0.49 +MOGO_COMMONS_VERSION=2.0.34 +MOGO_UTILS_VERSION=2.0.34 +MAP_AMAP_VERSION=2.0.34 +MAP_AUTONAVI_VERSION=2.0.34 +MOGO_MAP_VERSION=2.0.34 +MOGO_MAP_API_VERSION=2.0.34 +MOGO_SERVICE_VERSION=2.0.34 +MOGO_SERVICE_API_VERSION=2.0.34 +MOGO_CONNECTION_VERSION=2.0.34 +MOGO_MODULE_APPS_VERSION=2.0.34 +MOGO_MODULE_NAVI_VERSION=2.0.34 +MOGO_MODULE_SHARE_VERSION=2.0.34 +MOGO_MODULE_COMMON_VERSION=2.0.34 +MOGO_MODULE_MAIN_VERSION=2.0.34 +MOGO_MODULE_MAP_VERSION=2.0.34 +MOGO_MODULE_SERVICE_VERSION=2.0.34 +MOGO_MODULE_EXTENSIONS_VERSION=2.0.34 +MOGO_MODULE_SEARCH_VERSION=2.0.34 +MOGO_MODULE_BACK_VERSION=2.0.34 +MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.34 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.34 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.34 +MOGO_MODULE_AUTHORIZE_VERSION=2.0.34 +MOGO_MODULE_GUIDE_VERSION=2.0.34 +MOGO_MODULE_MEDIA_VERSION=2.0.34 +MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.34 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.34 +MOGO_MODULE_V2X_VERSION=2.0.34 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION = 2.0.49 -MOGO_BASE_SERVICES_APK_VERSION=2.0.49 -MOGO_BASE_SERVICES_SDK_VERSION=2.0.49 +MOGO_BASE_WEBSOCKET_SDK_VERSION = 2.0.34 +MOGO_BASE_SERVICES_APK_VERSION=2.0.34 +MOGO_BASE_SERVICES_SDK_VERSION=2.0.34 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=2.0.49 +MOGO_MODULE_TANLU_VERSION=2.0.34 # 视频引导 -MOGO_MODULE_GUIDESHOW_VERSION=2.0.49 +MOGO_MODULE_GUIDESHOW_VERSION=2.0.34 # 推送 -MOGO_MODULE_PUSH_VERSION=2.0.49 -MOGO_MODULE_PUSH_BASE_VERSION=2.0.49 -MOGO_MODULE_PUSH_NOOP_VERSION=2.0.49 +MOGO_MODULE_PUSH_VERSION=2.0.34 +MOGO_MODULE_PUSH_BASE_VERSION=2.0.34 +MOGO_MODULE_PUSH_NOOP_VERSION=2.0.34 # 探路上报和分享模块 -TANLULIB_VERSION=2.0.49 -MOGO_TANLU_API_VERSION=2.0.49 +TANLULIB_VERSION=2.0.34 +MOGO_TANLU_API_VERSION=2.0.34 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.0.49 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.49 +MOGO_MODULE_LEFT_PANEL_VERSION=2.0.34 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.34 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.0.49 +MOGO_MODULE_WIDGETS_VERSION=2.0.34 # obu -MOGO_MODULE_OBU_VERSION=2.0.49 -MOGO_MODULE_OBU_MOGO_VERSION=2.0.49 +MOGO_MODULE_OBU_VERSION=2.0.34 +MOGO_MODULE_OBU_MOGO_VERSION=2.0.34 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.0.49 -MOGO_SKIN_LIGHT_VERSION=2.0.49 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.49 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.49 -SKIN_SUPPORT_VERSION=2.0.49 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.49 -SKIN_SUPPORT_CARDVIEW_VERSION=2.0.49 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.49 -SKIN_SUPPORT_DESIGN_VERSION=2.0.49 +MOGO_SKIN_SUPPORT_VERSION=2.0.34 +MOGO_SKIN_LIGHT_VERSION=2.0.34 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.34 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.34 +SKIN_SUPPORT_VERSION=2.0.34 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.34 +SKIN_SUPPORT_CARDVIEW_VERSION=2.0.34 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.34 +SKIN_SUPPORT_DESIGN_VERSION=2.0.34 # 闪屏页 -MOGO_MODULE_SPLASH_VERSION=2.0.49 -MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.49 +MOGO_MODULE_SPLASH_VERSION=2.0.34 +MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.34 # monitor -MOGO_MODULE_MONITOR_VERSION=2.0.49 +MOGO_MODULE_MONITOR_VERSION=2.0.34 # bugly -CRASHREPORT_VERSION=2.0.49 -CRASHREPORT_BUGLY_VERSION=2.0.49 -CRASHREPORT_NOOP_VERSION=2.0.49 -CRASHREPORT_UPGRADE_VERSION=2.0.49 +CRASHREPORT_VERSION=2.0.34 +CRASHREPORT_BUGLY_VERSION=2.0.34 +CRASHREPORT_NOOP_VERSION=2.0.34 +CRASHREPORT_UPGRADE_VERSION=2.0.34 ## tts -TTS_BASE_VERSION=2.0.49 -TTS_DI_VERSION=2.0.49 -TTS_ZHI_VERSION=2.0.49 -TTS_PAD_VERSION=2.0.49 -TTS_NOOP_VERSION=2.0.49 +TTS_BASE_VERSION=2.0.34 +TTS_DI_VERSION=2.0.34 +TTS_ZHI_VERSION=2.0.34 +TTS_PAD_VERSION=2.0.34 +TTS_NOOP_VERSION=2.0.34 # 自研地图 -MAP_CUSTOM_VERSION=2.0.49 -MOGO_MODULE_SMP_VERSION=2.0.49 -MOGO_MODULE_ADAS_VERSION=2.0.49 +MAP_CUSTOM_VERSION=2.0.34 +MOGO_MODULE_SMP_VERSION=2.0.34 +MOGO_MODULE_ADAS_VERSION=2.0.34 # OCH -MOGO_OCH_VERSION=2.0.49 -MOGO_OCH_BUS_VERSION=2.0.49 -MOGO_OCH_NOOP_VERSION=2.0.49 -MOGO_OCH_TAXI_VERSION=2.0.49 -# mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.49 +MOGO_OCH_VERSION=2.0.34 +MOGO_OCH_BUS_VERSION=2.0.34 +MOGO_OCH_NOOP_VERSION=2.0.34 +MOGO_OCH_TAXI_VERSION=2.0.34 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.2.335 +CARCHATTING_VERSION=2.2.330 # 车聊聊接口 -CARCHATTINGPROVIDER_VERSION=1.1.15 +CARCHATTINGPROVIDER_VERSION=1.1.11 # websocket WEBSOCKET_VERSION=1.1.7 # loglib @@ -148,22 +152,24 @@ LOGLIB_VERSION = 1.0.4 ######## MogoAiCloudSDK Version # 网络请求 -MOGO_NETWORK_VERSION=1.1.46 +MOGO_NETWORK_VERSION=1.1.36 # 鉴权 -MOGO_PASSPORT_VERSION=1.1.46 +MOGO_PASSPORT_VERSION=1.1.36 # 常链接 -MOGO_SOCKET_VERSION=1.1.46 +MOGO_SOCKET_VERSION=1.1.36 # 数据采集 -MOGO_REALTIME_VERSION=1.1.46 +MOGO_REALTIME_VERSION=1.1.36 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.1.46 +MOGO_TANLU_VERSION=1.1.36 # 直播推流 -MOGO_LIVE_VERSION=1.1.46 +MOGO_LIVE_VERSION=1.1.36 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.1.46 +MOGO_TRAFFICLIVE_VERSION=1.1.36 # 定位服务 -MOGO_LOCATION_VERSION=1.1.46 +MOGO_LOCATION_VERSION=1.1.36 +# mogoAiCloud sdk services +MOGO_AICLOUD_SERVICES_SDK_VERSION=1.0.0-SNAPSHOT # 自研地图 MAP_SDK_VERSION=1.0.1-vr-1.0.6 diff --git a/libraries/mogo-map/build.gradle b/libraries/mogo-map/build.gradle index f072b5cf2c..c9c9969d4c 100644 --- a/libraries/mogo-map/build.gradle +++ b/libraries/mogo-map/build.gradle @@ -25,6 +25,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.arouter + implementation rootProject.ext.dependencies.callchatprovider if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogoutils diff --git a/modules/mogo-module-service/build.gradle b/modules/mogo-module-service/build.gradle index 641620260c..1bda8e1e11 100644 --- a/modules/mogo-module-service/build.gradle +++ b/modules/mogo-module-service/build.gradle @@ -33,6 +33,11 @@ android { sourceCompatibility 1.8 targetCompatibility 1.8 } + + lintOptions { + abortOnError false + } + } dependencies { @@ -44,23 +49,22 @@ dependencies { annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid + implementation rootProject.ext.dependencies.callchatprovider implementation rootProject.ext.dependencies.androidxrecyclerview - implementation rootProject.ext.dependencies.callchatprovider - if (Boolean.valueOf(RELEASE)) { - implementation rootProject.ext.dependencies.mogomap - implementation rootProject.ext.dependencies.mogomapapi - implementation rootProject.ext.dependencies.mogoutils - implementation rootProject.ext.dependencies.mogocommons - implementation rootProject.ext.dependencies.mogoserviceapi + api rootProject.ext.dependencies.mogomap + api rootProject.ext.dependencies.mogomapapi + api rootProject.ext.dependencies.mogoutils + api rootProject.ext.dependencies.mogocommons + api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon } else { - implementation project(":libraries:mogo-map") - implementation project(":libraries:mogo-map-api") - implementation project(":foudations:mogo-utils") - implementation project(":foudations:mogo-commons") - implementation project(':services:mogo-service-api') + api project(":libraries:mogo-map") + api project(":libraries:mogo-map-api") + api project(":foudations:mogo-utils") + api project(":foudations:mogo-commons") + api project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') } } diff --git a/modules/mogo-module-widgets/build.gradle b/modules/mogo-module-widgets/build.gradle index 6aa04d8dc4..0d301fe7a3 100644 --- a/modules/mogo-module-widgets/build.gradle +++ b/modules/mogo-module-widgets/build.gradle @@ -46,6 +46,7 @@ dependencies { annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid + implementation rootProject.ext.dependencies.callchatprovider if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogomapapi