merge code
This commit is contained in:
@@ -1,11 +1,10 @@
|
||||
plugins {
|
||||
id 'com.android.library'
|
||||
id 'org.jetbrains.kotlin.android'
|
||||
id 'kotlin-parcelize' // 序列化
|
||||
id 'kotlin-android'
|
||||
id 'kotlin-kapt'
|
||||
id 'realm-android'
|
||||
}
|
||||
apply plugin: 'kotlin-android'
|
||||
apply plugin: 'kotlin-kapt'
|
||||
apply plugin: 'realm-android'
|
||||
|
||||
ext.roomversion = "2.1.0"
|
||||
ext.vtmVersion = "0.18.0"
|
||||
@@ -49,15 +48,9 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
//configurations.all {
|
||||
// resolutionStrategy {
|
||||
// force 'com.intellij:annotations:13.0'
|
||||
// }
|
||||
//}
|
||||
dependencies {
|
||||
api fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
|
||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||
api files('libs/BaiduLBS_Android.jar')
|
||||
|
||||
api 'androidx.core:core-ktx:1.9.0'
|
||||
api 'androidx.appcompat:appcompat:1.6.1'
|
||||
api 'com.google.android.material:material:1.8.0'
|
||||
@@ -119,17 +112,6 @@ dependencies {
|
||||
kapt "androidx.room:room-compiler:2.5.1"
|
||||
kapt "androidx.room:room-ktx:2.5.1"
|
||||
|
||||
// //分页加载
|
||||
// api "androidx.room:room-paging:$roomversion"
|
||||
// api "androidx.paging:paging-runtime-ktx:3.1.1"
|
||||
|
||||
androidTestImplementation "android.arch.persistence.room:testing:1.1.1"
|
||||
api 'com.tencent.wcdb:wcdb-android:1.1-19'
|
||||
//api 'de.mrmaffen:libvlc-android:2.1.12@aar'
|
||||
// // 协程核心库
|
||||
// implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
|
||||
// // 协程Android支持库
|
||||
// implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
|
||||
// // 协程Java8支持库
|
||||
// implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4'
|
||||
}
|
||||
Reference in New Issue
Block a user