diff --git a/gradle.properties b/gradle.properties index 79795072ab..422ddef37e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,80 +29,80 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=2.0.2 -MOGO_UTILS_VERSION=2.0.0 -MAP_AMAP_VERSION=2.0.0 -MAP_AUTONAVI_VERSION=2.0.0 -MOGO_MAP_VERSION=2.0.0 -MOGO_MAP_API_VERSION=2.0.0 -MOGO_SERVICE_VERSION=2.0.0 -MOGO_SERVICE_API_VERSION=2.0.2 -MOGO_CONNECTION_VERSION=2.0.0 -MOGO_MODULE_APPS_VERSION=2.0.0 -MOGO_MODULE_NAVI_VERSION=2.0.0 -MOGO_MODULE_SHARE_VERSION=2.0.0 -MOGO_MODULE_COMMON_VERSION=2.0.0 -MOGO_MODULE_MAIN_VERSION=2.0.0 -MOGO_MODULE_MAP_VERSION=2.0.0 -MOGO_MODULE_SERVICE_VERSION=2.0.0 -MOGO_MODULE_EXTENSIONS_VERSION=2.0.0 -MOGO_MODULE_SEARCH_VERSION=2.0.0 -MOGO_MODULE_BACK_VERSION=2.0.0 -MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.0 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.0 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.0 -MOGO_MODULE_AUTHORIZE_VERSION=2.0.0 -MOGO_MODULE_GUIDE_VERSION=2.0.0 -MOGO_MODULE_MEDIA_VERSION=2.0.0 -MOGO_MODULE_MAIN_LAUNCHER_VERSION = 2.0.0 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 2.0.0 -MOGO_MODULE_V2X_VERSION=2.0.0 +MOGO_COMMONS_VERSION=2.0.6 +MOGO_UTILS_VERSION=2.0.6 +MAP_AMAP_VERSION=2.0.6 +MAP_AUTONAVI_VERSION=2.0.6 +MOGO_MAP_VERSION=2.0.6 +MOGO_MAP_API_VERSION=2.0.6 +MOGO_SERVICE_VERSION=2.0.6 +MOGO_SERVICE_API_VERSION=2.0.6 +MOGO_CONNECTION_VERSION=2.0.6 +MOGO_MODULE_APPS_VERSION=2.0.6 +MOGO_MODULE_NAVI_VERSION=2.0.6 +MOGO_MODULE_SHARE_VERSION=2.0.6 +MOGO_MODULE_COMMON_VERSION=2.0.6 +MOGO_MODULE_MAIN_VERSION=2.0.6 +MOGO_MODULE_MAP_VERSION=2.0.6 +MOGO_MODULE_SERVICE_VERSION=2.0.6 +MOGO_MODULE_EXTENSIONS_VERSION=2.0.6 +MOGO_MODULE_SEARCH_VERSION=2.0.6 +MOGO_MODULE_BACK_VERSION=2.0.6 +MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.6 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.6 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.6 +MOGO_MODULE_AUTHORIZE_VERSION=2.0.6 +MOGO_MODULE_GUIDE_VERSION=2.0.6 +MOGO_MODULE_MEDIA_VERSION=2.0.6 +MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.6 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.6 +MOGO_MODULE_V2X_VERSION=2.0.6 # 基础服务实现：passport、socket、location -MOGO_BASE_SERVICES_APK_VERSION = 2.0.0 -MOGO_BASE_SERVICES_SDK_VERSION = 2.0.0 +MOGO_BASE_SERVICES_APK_VERSION=2.0.6 +MOGO_BASE_SERVICES_SDK_VERSION=2.0.6 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=2.0.0 +MOGO_MODULE_TANLU_VERSION=2.0.6 # 视频引导 -MOGO_MODULE_GUIDESHOW_VERSION=2.0.0 +MOGO_MODULE_GUIDESHOW_VERSION=2.0.6 # 推送 -MOGO_MODULE_PUSH_VERSION=2.0.0 -MOGO_MODULE_PUSH_BASE_VERSION=2.0.0 -MOGO_MODULE_PUSH_NOOP_VERSION=2.0.0 +MOGO_MODULE_PUSH_VERSION=2.0.6 +MOGO_MODULE_PUSH_BASE_VERSION=2.0.6 +MOGO_MODULE_PUSH_NOOP_VERSION=2.0.6 # 探路上报和分享模块 -TANLULIB_VERSION=2.0.0 -MOGO_TANLU_API_VERSION=2.0.0 +TANLULIB_VERSION=2.0.6 +MOGO_TANLU_API_VERSION=2.0.6 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.0.0 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.0 +MOGO_MODULE_LEFT_PANEL_VERSION=2.0.6 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.6 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.0.0 +MOGO_MODULE_WIDGETS_VERSION=2.0.6 # obu -MOGO_MODULE_OBU_VERSION=2.0.0 +MOGO_MODULE_OBU_VERSION=2.0.6 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.0.0 -MOGO_SKIN_LIGHT_VERSION=2.0.0 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.0 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.0 -SKIN_SUPPORT_VERSION=2.0.0 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.0 -SKIN_SUPPORT_CARDVIEW_VERSION=2.0.0 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.0 -SKIN_SUPPORT_DESIGN_VERSION=2.0.0 +MOGO_SKIN_SUPPORT_VERSION=2.0.6 +MOGO_SKIN_LIGHT_VERSION=2.0.6 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.6 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.6 +SKIN_SUPPORT_VERSION=2.0.6 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.6 +SKIN_SUPPORT_CARDVIEW_VERSION=2.0.6 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.6 +SKIN_SUPPORT_DESIGN_VERSION=2.0.6 # 闪屏页 -MOGO_MODULE_SPLASH_VERSION=2.0.0 -MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.0 +MOGO_MODULE_SPLASH_VERSION=2.0.6 +MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.6 # monitor -MOGO_MODULE_MONITOR_VERSION=2.0.0 +MOGO_MODULE_MONITOR_VERSION=2.0.6 # bugly -CRASHREPORT_VERSION=2.0.0 -CRASHREPORT_BUGLY_VERSION=2.0.0 -CRASHREPORT_NOOP_VERSION=2.0.0 +CRASHREPORT_VERSION=2.0.6 +CRASHREPORT_BUGLY_VERSION=2.0.6 +CRASHREPORT_NOOP_VERSION=2.0.6 ## tts -TTS_BASE_VERSION=1.0.0 -TTS_DI_VERSION=1.0.0 -TTS_ZHI_VERSION=1.0.0 -TTS_NOOP_VERSION=1.0.0 +TTS_BASE_VERSION=2.0.6 +TTS_DI_VERSION=2.0.6 +TTS_ZHI_VERSION=2.0.6 +TTS_NOOP_VERSION=2.0.6 ######## 外部依赖引用 # 车聊聊 diff --git a/libraries/tanlulib/build.gradle b/libraries/tanlulib/build.gradle index 93ed35b31b..dba6a1d3df 100644 --- a/libraries/tanlulib/build.gradle +++ b/libraries/tanlulib/build.gradle @@ -3,6 +3,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' apply plugin: 'android-aspectjx' +apply plugin: 'com.alibaba.arouter' android { @@ -73,9 +74,11 @@ dependencies { if (Boolean.valueOf(RELEASE)) { compileOnly rootProject.ext.dependencies.mogocommons compileOnly rootProject.ext.dependencies.mogomap + compileOnly rootProject.ext.dependencies.mogoserviceapi } else { implementation project(':modules:mogo-module-common') implementation project(':libraries:mogo-map') + implementation project(':services:mogo-service-api') } } diff --git a/upload.sh b/upload.sh index 054ba576f4..17478021a0 100755 --- a/upload.sh +++ b/upload.sh @@ -1,4 +1,4 @@ -#!/bin/bash +!/bin/bash ./gradlew :foudations:mogo-utils:clean :foudations:mogo-utils:uploadArchives if [ $? -ne 0 ];then exit; fi @@ -6,14 +6,14 @@ if [ $? -ne 0 ];then exit; fi if [ $? -ne 0 ]; then exit; fi ./gradlew :tts:tts-base:clean :tts:tts-base:uploadArchives if [ $? -ne 0 ]; then exit; fi +./gradlew :foudations:mogo-commons:clean :foudations:mogo-commons:uploadArchives +if [ $? -ne 0 ]; then exit; fi ./gradlew :tts:tts-zhi:clean :tts:tts-zhi:uploadArchives if [ $? -ne 0 ]; then exit; fi ./gradlew :tts:tts-di:clean :tts:tts-di:uploadArchives if [ $? -ne 0 ]; then exit; fi ./gradlew :tts:tts-noop:clean :tts:tts-noop:uploadArchives if [ $? -ne 0 ]; then exit; fi -./gradlew :foudations:mogo-commons:clean :foudations:mogo-commons:uploadArchives -if [ $? -ne 0 ]; then exit; fi ./gradlew :libraries:mogo-map-api:clean :libraries:mogo-map-api:uploadArchives if [ $? -ne 0 ]; then exit; fi ./gradlew :skin:skin-support:clean :skin:skin-support:uploadArchives @@ -102,15 +102,11 @@ if [ $? -ne 0 ]; then exit; fi if [ $? -ne 0 ]; then exit; fi ./gradlew :libraries:tanlulib:clean :libraries:tanlulib:uploadArchives if [ $? -ne 0 ]; then exit; fi -./gradlew :libraries:mogo-tanlu-api:clean :libraries:mogo-tanlu-api:uploadArchives -if [ $? -ne 0 ]; then exit; fi ./gradlew :modules:mogo-module-monitor:clean :modules:mogo-module-monitor:uploadArchives if [ $? -ne 0 ]; then exit; fi ./gradlew :modules:mogo-module-splash:clean :modules:mogo-module-splash:uploadArchives if [ $? -ne 0 ]; then exit; fi ./gradlew :modules:mogo-module-splash-noop:clean :modules:mogo-module-splash-noop:uploadArchives if [ $? -ne 0 ]; then exit; fi -./gradlew :modules:mogo-module-tanlu:clean :modules:mogo-module-tanlu:uploadArchives -if [ $? -ne 0 ]; then exit; fi ./gradlew :modules:mogo-module-widgets:clean :modules:mogo-module-widgets:uploadArchives if [ $? -ne 0 ]; then exit; fi \ No newline at end of file