From 7db37606bd55a62ec9a53c9121fcfe276e62886c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 20 Jul 2020 18:01:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=89=88=E6=9C=AC1.2.1.2?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 56 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7a46f14048..c312c4e1b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,34 +29,34 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=1.2.1.19 -MOGO_UTILS_VERSION=1.2.1.19 -MAP_AMAP_VERSION=1.2.1.19 -MAP_AUTONAVI_VERSION=1.2.1.19 -MOGO_MAP_VERSION=1.2.1.19 -MOGO_MAP_API_VERSION=1.2.1.19 -MOGO_SERVICE_VERSION=1.2.1.19 -MOGO_SERVICE_API_VERSION=1.2.1.19 -MOGO_CONNECTION_VERSION=1.2.1.19 -MOGO_MODULE_APPS_VERSION=1.2.1.19 -MOGO_MODULE_NAVI_VERSION=1.2.1.19 -MOGO_MODULE_SHARE_VERSION=1.2.1.19 -MOGO_MODULE_COMMON_VERSION=1.2.1.19 -MOGO_MODULE_MAIN_VERSION=1.2.1.19 -MOGO_MODULE_MAP_VERSION=1.2.1.19 -MOGO_MODULE_SERVICE_VERSION=1.2.1.19 -MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.19 -MOGO_MODULE_SEARCH_VERSION=1.2.1.19 -MOGO_MODULE_BACK_VERSION=1.2.1.19 -MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.19 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.19 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.19 -MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.19 -MOGO_MODULE_GUIDE_VERSION=1.2.1.19 -MOGO_MODULE_MEDIA_VERSION=1.2.1.19 -MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.2.1.19 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.19 -MOGO_MODULE_V2X_VERSION=1.2.1.19 +MOGO_COMMONS_VERSION=1.2.1.20 +MOGO_UTILS_VERSION=1.2.1.20 +MAP_AMAP_VERSION=1.2.1.20 +MAP_AUTONAVI_VERSION=1.2.1.20 +MOGO_MAP_VERSION=1.2.1.20 +MOGO_MAP_API_VERSION=1.2.1.20 +MOGO_SERVICE_VERSION=1.2.1.20 +MOGO_SERVICE_API_VERSION=1.2.1.20 +MOGO_CONNECTION_VERSION=1.2.1.20 +MOGO_MODULE_APPS_VERSION=1.2.1.20 +MOGO_MODULE_NAVI_VERSION=1.2.1.20 +MOGO_MODULE_SHARE_VERSION=1.2.1.20 +MOGO_MODULE_COMMON_VERSION=1.2.1.20 +MOGO_MODULE_MAIN_VERSION=1.2.1.20 +MOGO_MODULE_MAP_VERSION=1.2.1.20 +MOGO_MODULE_SERVICE_VERSION=1.2.1.21 +MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.20 +MOGO_MODULE_SEARCH_VERSION=1.2.1.20 +MOGO_MODULE_BACK_VERSION=1.2.1.20 +MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.20 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.20 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.20 +MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.20 +MOGO_MODULE_GUIDE_VERSION=1.2.1.20 +MOGO_MODULE_MEDIA_VERSION=1.2.1.20 +MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.2.1.20 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.20 +MOGO_MODULE_V2X_VERSION=1.2.1.20 ## 工程外部模块 # 探路 From 329fcd8df8544f82e24a89ff859131bfdc210ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 20 Jul 2020 18:29:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index c312c4e1b5..2854537f48 100644 --- a/gradle.properties +++ b/gradle.properties @@ -99,8 +99,8 @@ MOGO_MODULE_SPLASH_VERSION = 1.0.0-SNAPSHOT MOGO_MODULE_SPLASH_NOOP_VERSION = 1.0.0-SNAPSHOT # 基础服务实现：passport、socket、location -MOGO_BASE_SERVICES_APK_VERSION = 1.0.0 -MOGO_BASE_SERVICES_SDK_VERSION = 1.0.0 +MOGO_BASE_SERVICES_APK_VERSION = 1.0.1 +MOGO_BASE_SERVICES_SDK_VERSION = 1.0.1 ## 产品库必备配置 applicationId=com.mogo.launcer From 3ec08f7379743db5c3079bb34c39edd569827265 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 20 Jul 2020 19:08:14 +0800 Subject: [PATCH 3/4] fix base module maven id --- .idea/misc.xml | 2 +- config.gradle | 4 ++-- foudations/mogo-base-services-sdk/gradle.properties | 6 +++--- gradle.properties | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/config.gradle b/config.gradle index 555c961b34..9c48144eb6 100644 --- a/config.gradle +++ b/config.gradle @@ -171,7 +171,7 @@ targetSdkVersion : 22, modulesplash : "com.mogo.module:module-splash:${MOGO_MODULE_SPLASH_VERSION}", // 基础服务实现 - mogobaseservicesdk : "com.mogo.base:services-apk:${MOGO_BASE_SERVICES_SDK_VERSION}", - mogobaseserviceapk : "com.mogo.base:services-sdk:${MOGO_BASE_SERVICES_APK_VERSION}", + mogobaseservicesdk : "com.mogo.base:services-sdk:${MOGO_BASE_SERVICES_SDK_VERSION}", + mogobaseserviceapk : "com.mogo.base:services-apk:${MOGO_BASE_SERVICES_APK_VERSION}", ] } \ No newline at end of file diff --git a/foudations/mogo-base-services-sdk/gradle.properties b/foudations/mogo-base-services-sdk/gradle.properties index a753d03b00..ce31a0de78 100644 --- a/foudations/mogo-base-services-sdk/gradle.properties +++ b/foudations/mogo-base-services-sdk/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.connection -POM_ARTIFACT_ID=mogo-base-services-sdk -VERSION_CODE=1 +GROUP=com.mogo.base +POM_ARTIFACT_ID=services-sdk +VERSION_CODE=1 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 2854537f48..12d0a3d336 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -RELEASE=false +RELEASE=true # 模块版本 ## 工程内模块 MOGO_COMMONS_VERSION=1.2.1.20 From c08a1bed9b252b4e0787830f1cc88984857e5915 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 20 Jul 2020 19:10:10 +0800 Subject: [PATCH 4/4] change release mode --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 12d0a3d336..2854537f48 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -RELEASE=true +RELEASE=false # 模块版本 ## 工程内模块 MOGO_COMMONS_VERSION=1.2.1.20