Revert "迁移Android X"

This reverts commit 6df2d64ddb.
This commit is contained in:
oujunhui
2020-04-09 12:35:00 +08:00
parent c8b351c82e
commit 06bd068125
1188 changed files with 3322 additions and 2788 deletions

View File

@@ -9,7 +9,7 @@ android {
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
flavorDimensions 'default'
}
@@ -87,8 +87,8 @@ android {
}
def link_page = "1.1.9"
def loggerVersion = "2.2.0"
def link_page = "1.1.2"
def loggerVersion = "2.1.1"
def BaiduMtjVersion = "3.8.2.1"
def Lombok = "1.16.20"
def room_version = "1.1.1"
@@ -98,8 +98,8 @@ def umeng_analytics = "8.1.4"
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
api "cc.linkedme.deeplinks:link-page:${link_page}"
@@ -124,7 +124,7 @@ dependencies {
api 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:5.1.6'
// 声网
api 'io.agora.rtc:full-sdk:2.9.4'
api 'io.agora.rtc:full-sdk:2.4.1'
// 易盾
api 'com.netease.mobsec:netmobsecLib:4.2.4.1@aar'
@@ -139,10 +139,10 @@ dependencies {
// provide okhttp to connect to backend
implementation 'com.liulishuo.okdownload:okhttp:1.0.4'
// Room
api 'androidx.room:room-runtime:2.2.5'
annotationProcessor 'androidx.room:room-compiler:2.2.5'
api "android.arch.persistence.room:runtime:${room_version}"
annotationProcessor "android.arch.persistence.room:compiler:1.1.0"
// RxJava support for Room
api 'androidx.room:room-rxjava2:2.2.5'
api "android.arch.persistence.room:rxjava2:${room_version}"
api project(':nim_uikit')