From 411fba5610e0aa713c6c5b6cd90af4f0c9ade177 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 4 Feb 2021 12:57:35 +0100 Subject: [PATCH] libs update --- app/build.gradle | 6 +++--- build.gradle | 4 ++-- omnipod/build.gradle | 2 +- wear/build.gradle | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a26bda057e..04fb0b520d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -245,14 +245,14 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') testImplementation "junit:junit:$junit_version" - testImplementation 'org.json:json:20200518' + testImplementation 'org.json:json:20201115' testImplementation "org.mockito:mockito-core:${mockitoVersion}" testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}" - testImplementation 'joda-time:joda-time:2.10.6' - testImplementation('com.google.truth:truth:1.0.1') { + testImplementation 'joda-time:joda-time:2.10.9' + testImplementation('com.google.truth:truth:1.1.2') { exclude group: "com.google.guava", module: "guava" exclude group: "com.google.code.findbugs", module: "jsr305" } diff --git a/build.gradle b/build.gradle index 87f1d32bd3..42771275e3 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { rxkotlin_version = '2.4.0' room_version = '2.2.5' lifecycle_version = '2.2.0' - dagger_version = '2.30.1' + dagger_version = '2.31.2' coroutinesVersion = '1.3.7' activityVersion = '1.2.0-rc01' fragmentktx_version = '1.3.0-rc01' @@ -30,7 +30,7 @@ buildscript { okhttp3Version = '4.9.0' androidx_junit = '1.1.2' - androidx_rules = '1.3.1-alpha02' + androidx_rules = '1.3.1-alpha03' } repositories { google() diff --git a/omnipod/build.gradle b/omnipod/build.gradle index c3b4f67e77..41548fa975 100644 --- a/omnipod/build.gradle +++ b/omnipod/build.gradle @@ -64,7 +64,7 @@ dependencies { testImplementation "org.mockito:mockito-core:${mockitoVersion}" testImplementation "org.powermock:powermock-api-mockito2:$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:rules:$androidx_rules" } diff --git a/wear/build.gradle b/wear/build.gradle index 5faf94bc8b..15cb872a0e 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -72,8 +72,8 @@ android { abortOnError false } + flavorDimensions "standard" productFlavors { - flavorDimensions "standard" full { applicationId "info.nightscout.androidaps" dimension "standard" @@ -126,23 +126,23 @@ dependencies { implementation('com.github.lecho:hellocharts-library:1.5.8@aar') testImplementation "junit:junit:$junit_version" - testImplementation 'org.json:json:20200518' + testImplementation 'org.json:json:20201115' testImplementation("org.mockito:mockito-core:${mockitoVersion}") { exclude group: 'net.bytebuddy', module: 'byte-buddy' exclude group: 'net.bytebuddy', module: 'byte-buddy-android' exclude group: 'net.bytebuddy', module: 'byte-buddy-agent' } // 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-android:1.10.17' - testImplementation 'net.bytebuddy:byte-buddy-agent:1.10.17' + testImplementation 'net.bytebuddy:byte-buddy:1.10.20' + testImplementation 'net.bytebuddy:byte-buddy-android:1.10.20' + testImplementation 'net.bytebuddy:byte-buddy-agent:1.10.20' testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}" - testImplementation 'joda-time:joda-time:2.10.6' - testImplementation('com.google.truth:truth:1.0.1') { + testImplementation 'joda-time:joda-time:2.10.9' + testImplementation('com.google.truth:truth:1.1.2') { exclude group: "com.google.guava", module: "guava" } testImplementation "org.skyscreamer:jsonassert:1.5.0"