Merge branch 'dev' into dev_custom_map

# Conflicts:
#	gradle.properties
This commit is contained in:
wangcongtao
2020-07-27 10:19:13 +08:00
18 changed files with 88 additions and 107 deletions

View File

@@ -276,7 +276,6 @@ dependencies {
implementation project(':foudations:mogo-commons')
implementation project(':modules:mogo-module-common')
implementation project(':modules:mogo-module-search')
implementation project(':modules:mogo-module-guide')
implementation project(':modules:mogo-module-authorize')
implementation project(':modules:mogo-module-media')
implementation project(':modules:mogo-module-service')

View File

@@ -19,7 +19,7 @@ project.dependencies {
d8xxImplementation project(':foudations:mogo-base-services-apk')
em4Implementation project(':foudations:mogo-base-services-apk')
e8xxImplementation project(':foudations:mogo-base-services-apk')
f8xxImplementation project(':foudations:mogo-base-services-apk')
f8xxImplementation project(':foudations:mogo-base-services-sdk')
em3Implementation project(':foudations:mogo-base-services-apk')
}
}