Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8
# Conflicts: # gradle.properties
This commit is contained in:
@@ -131,7 +131,7 @@ ext {
|
||||
jetbrainsannotationsjava5 : "org.jetbrains:annotations-java5:15.0",
|
||||
|
||||
// 统一登录
|
||||
accountsdk : "com.zhidao.accountservice:account-sdk:1.0.17",
|
||||
accountsdk : "com.zhidao.accountservice:account-sdk:1.0.18",
|
||||
// crash
|
||||
crashSdk : "com.zhidaoauto.crash.log:library:1.0.5",
|
||||
kotlinstdlibjdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}",
|
||||
|
||||
Reference in New Issue
Block a user