caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

libs update

Browse source
This commit is contained in:
Milos Kozak 2021-02-04 12:57:35 +01:00
parent d3310298b3
commit 411fba5610
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -245,14 +245,14 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
testImplementation "junit:junit:$junit_version" testImplementation "junit:junit:$junit_version"
testImplementation 'org.json:json:20200518' testImplementation 'org.json:json:20201115'
testImplementation "org.mockito:mockito-core:${mockitoVersion}" testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}" testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}"
testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}"
testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
testImplementation 'joda-time:joda-time:2.10.6' testImplementation 'joda-time:joda-time:2.10.9'
testImplementation('com.google.truth:truth:1.0.1') { testImplementation('com.google.truth:truth:1.1.2') {
exclude group: "com.google.guava", module: "guava" exclude group: "com.google.guava", module: "guava"
exclude group: "com.google.code.findbugs", module: "jsr305" exclude group: "com.google.code.findbugs", module: "jsr305"
} }

4
build.gradle
View file

@ -9,7 +9,7 @@ buildscript {
rxkotlin_version = '2.4.0' rxkotlin_version = '2.4.0'
room_version = '2.2.5' room_version = '2.2.5'
lifecycle_version = '2.2.0' lifecycle_version = '2.2.0'
dagger_version = '2.30.1' dagger_version = '2.31.2'
coroutinesVersion = '1.3.7' coroutinesVersion = '1.3.7'
activityVersion = '1.2.0-rc01' activityVersion = '1.2.0-rc01'
fragmentktx_version = '1.3.0-rc01' fragmentktx_version = '1.3.0-rc01'
@ -30,7 +30,7 @@ buildscript {
okhttp3Version = '4.9.0' okhttp3Version = '4.9.0'
androidx_junit = '1.1.2' androidx_junit = '1.1.2'
androidx_rules = '1.3.1-alpha02' androidx_rules = '1.3.1-alpha03'
} }
repositories { repositories {
google() google()

2
omnipod/build.gradle
View file

@ -64,7 +64,7 @@ dependencies {
testImplementation "org.mockito:mockito-core:${mockitoVersion}" testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion" testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion"
testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
testImplementation 'joda-time:joda-time:2.10.6' testImplementation 'joda-time:joda-time:2.10.9'
androidTestImplementation "androidx.test.ext:junit:$androidx_junit" androidTestImplementation "androidx.test.ext:junit:$androidx_junit"
androidTestImplementation "androidx.test:rules:$androidx_rules" androidTestImplementation "androidx.test:rules:$androidx_rules"
} }

14
wear/build.gradle
View file

@ -72,8 +72,8 @@ android {
abortOnError false abortOnError false
} }
productFlavors {
flavorDimensions "standard" flavorDimensions "standard"
productFlavors {
full { full {
applicationId "info.nightscout.androidaps" applicationId "info.nightscout.androidaps"
dimension "standard" dimension "standard"
@ -126,23 +126,23 @@ dependencies {
implementation('com.github.lecho:hellocharts-library:1.5.8@aar') implementation('com.github.lecho:hellocharts-library:1.5.8@aar')
testImplementation "junit:junit:$junit_version" testImplementation "junit:junit:$junit_version"
testImplementation 'org.json:json:20200518' testImplementation 'org.json:json:20201115'
testImplementation("org.mockito:mockito-core:${mockitoVersion}") { testImplementation("org.mockito:mockito-core:${mockitoVersion}") {
exclude group: 'net.bytebuddy', module: 'byte-buddy' exclude group: 'net.bytebuddy', module: 'byte-buddy'
exclude group: 'net.bytebuddy', module: 'byte-buddy-android' exclude group: 'net.bytebuddy', module: 'byte-buddy-android'
exclude group: 'net.bytebuddy', module: 'byte-buddy-agent' exclude group: 'net.bytebuddy', module: 'byte-buddy-agent'
} }
// to fix org.mockito:mockito-core dependency issues, fixed in mockito 3+ // to fix org.mockito:mockito-core dependency issues, fixed in mockito 3+
testImplementation 'net.bytebuddy:byte-buddy:1.10.17' testImplementation 'net.bytebuddy:byte-buddy:1.10.20'
testImplementation 'net.bytebuddy:byte-buddy-android:1.10.17' testImplementation 'net.bytebuddy:byte-buddy-android:1.10.20'
testImplementation 'net.bytebuddy:byte-buddy-agent:1.10.17' testImplementation 'net.bytebuddy:byte-buddy-agent:1.10.20'
testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}" testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}"
testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}"
testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
testImplementation 'joda-time:joda-time:2.10.6' testImplementation 'joda-time:joda-time:2.10.9'
testImplementation('com.google.truth:truth:1.0.1') { testImplementation('com.google.truth:truth:1.1.2') {
exclude group: "com.google.guava", module: "guava" exclude group: "com.google.guava", module: "guava"
} }
testImplementation "org.skyscreamer:jsonassert:1.5.0" testImplementation "org.skyscreamer:jsonassert:1.5.0"