caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

Browse source
This commit is contained in:
Milos Kozak 2021-08-28 19:13:20 +02:00
commit 1b87522a4b
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -25,12 +25,12 @@ buildscript {
work_version = '2.5.0' work_version = '2.5.0'
junit_version = '4.13.2' junit_version = '4.13.2'
mockitoVersion = '3.11.2' mockitoVersion = '3.12.1'
powermockVersion = '2.0.9' powermockVersion = '2.0.9'
dexmakerVersion = "1.2" dexmakerVersion = "1.2"
retrofit2Version = '2.9.0' retrofit2Version = '2.9.0'
okhttp3Version = '4.9.0' okhttp3Version = '4.9.0'
byteBuddyVersion = '1.11.12' byteBuddyVersion = '1.11.13'
androidx_junit = '1.1.2' androidx_junit = '1.1.2'
androidx_rules = '1.4.0-alpha04' androidx_rules = '1.4.0-alpha04'

2
database/build.gradle
View file

@ -24,7 +24,7 @@ dependencies {
implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version" implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
implementation("io.reactivex.rxjava2:rxkotlin:$rxkotlin_version") implementation("io.reactivex.rxjava2:rxkotlin:$rxkotlin_version")
implementation "com.google.code.gson:gson:2.8.7" implementation "com.google.code.gson:gson:2.8.8"
api "androidx.room:room-runtime:$room_version" api "androidx.room:room-runtime:$room_version"
kapt "androidx.room:room-compiler:$room_version" kapt "androidx.room:room-compiler:$room_version"

2
pump-common/build.gradle
View file

@ -12,7 +12,7 @@ dependencies {
implementation project(':core') implementation project(':core')
//implementation project(':database') //implementation project(':database')
implementation('com.thoughtworks.xstream:xstream:1.4.17') { implementation('com.thoughtworks.xstream:xstream:1.4.18') {
exclude group: 'xmlpull', module: 'xmlpull' exclude group: 'xmlpull', module: 'xmlpull'
} }
} }