Merge branch 'master' into export_import_settings
# Conflicts: # app/src/main/res/menu/menu_main.xml
This commit is contained in:
commit
05ced83909
71 changed files with 1278 additions and 206 deletions
|
|
@ -66,7 +66,7 @@ android {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'com.github.SimpleMobileTools:Simple-Commons:b4cc381943'
|
||||
implementation 'com.github.SimpleMobileTools:Simple-Commons:8814cd2d4b'
|
||||
implementation 'org.greenrobot:eventbus:3.3.1'
|
||||
implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
|
||||
implementation 'com.github.tibbi:android-smsmms:5657799572'
|
||||
|
|
@ -76,7 +76,7 @@ dependencies {
|
|||
implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
|
||||
|
||||
kapt "androidx.room:room-compiler:2.5.1"
|
||||
implementation "androidx.room:room-runtime:2.5.1"
|
||||
annotationProcessor "androidx.room:room-compiler:2.5.1"
|
||||
kapt "androidx.room:room-compiler:2.5.2"
|
||||
implementation "androidx.room:room-runtime:2.5.2"
|
||||
annotationProcessor "androidx.room:room-compiler:2.5.2"
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue