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

解决，冲突

Browse Source
This commit is contained in:
董宏宇
2021-01-25 17:14:35 +08:00
parent 520d36a412
commit 5f2f2653b6
13 changed files with 90 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/mogo-realtime/build.gradle
View File

@@ -29,9 +29,12 @@ dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation project(path: ':foudations:mogo-passport')
// implementation project(":foudations:mogo-commons")
implementation 'com.mogo.cloud:commons:1.0.2-SNAPSHOT'
// implementation project(":foudations:mogo-socket")
implementation 'com.mogo.cloud:socket:1.0.2-SNAPSHOT'
if (Boolean.valueOf(RELEASE)) {
implementation "com.mogo.cloud:commons:${MOGO_COMMONS_VERSION}"
implementation "com.mogo.cloud:socket:${MOGO_SOCKET_VERSION}"
} else {
implementation project(":foudations:mogo-socket")
implementation project(":foudations:mogo-commons")
}
}

7
modules/mogo-tanlu/build.gradle
View File

@@ -38,8 +38,11 @@ dependencies {
implementation rootProject.ext.dependencies.rxjava
implementation rootProject.ext.dependencies.rxandroid
// implementation project(path: ':foudations:mogo-commons')
implementation 'com.mogo.cloud:commons:1.0.2-SNAPSHOT'
if (Boolean.valueOf(RELEASE)) {
implementation "com.mogo.cloud:commons:${MOGO_COMMONS_VERSION}"
} else {
implementation project(path: ':foudations:mogo-commons')
}
}