From bd9a96c2f14096c886939b806525b07c1ee3034b Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Wed, 1 Jan 2020 18:03:53 -0500 Subject: [PATCH] Update some dependencies --- android/gradle.properties | 6 +++--- android/uhabits-android/build.gradle | 10 +++++----- android/uhabits-core/build.gradle | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/android/gradle.properties b/android/gradle.properties index 1e1d45f89..c8b643973 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -5,11 +5,11 @@ MIN_SDK_VERSION = 21 TARGET_SDK_VERSION = 29 COMPILE_SDK_VERSION = 29 -DAGGER_VERSION = 2.25.2 -KOTLIN_VERSION = 1.3.50 +DAGGER_VERSION = 2.25.4 +KOTLIN_VERSION = 1.3.61 SUPPORT_LIBRARY_VERSION = 28.0.0 AUTO_FACTORY_VERSION = 1.0-beta6 -BUILD_TOOLS_VERSION = 3.5.2 +BUILD_TOOLS_VERSION = 3.5.3 org.gradle.parallel=false org.gradle.daemon=true diff --git a/android/uhabits-android/build.gradle b/android/uhabits-android/build.gradle index b4747e66c..22a26aae9 100644 --- a/android/uhabits-android/build.gradle +++ b/android/uhabits-android/build.gradle @@ -78,7 +78,7 @@ dependencies { implementation "com.google.dagger:dagger:$DAGGER_VERSION" implementation "com.jakewharton:butterknife:8.6.1-SNAPSHOT" implementation "org.apmem.tools:layouts:1.10" - implementation "com.google.code.gson:gson:2.7" + implementation "com.google.code.gson:gson:2.8.5" implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION" @@ -105,15 +105,15 @@ dependencies { // mockito-android 2+ includes net.bytebuddy, which causes tests to fail. // Excluding the package net.bytebuddy on AndroidManifest.xml breaks some // AndroidJUnitRunner functionality, such as running individual methods. - androidTestImplementation "org.mockito:mockito-core:1+" - androidTestImplementation "com.google.dexmaker:dexmaker-mockito:+" + androidTestImplementation "org.mockito:mockito-core:1.10.19" + androidTestImplementation "com.google.dexmaker:dexmaker-mockito:1.2" testImplementation "com.google.dagger:dagger:$DAGGER_VERSION" testImplementation "org.mockito:mockito-core:2.8.9" testImplementation "org.mockito:mockito-inline:2.8.9" - testImplementation "junit:junit:4+" + testImplementation "junit:junit:4.12" - implementation('com.opencsv:opencsv:3.9') { + implementation('com.opencsv:opencsv:3.10') { exclude group: 'commons-logging', module: 'commons-logging' } implementation('io.socket:socket.io-client:0.8.3') { diff --git a/android/uhabits-core/build.gradle b/android/uhabits-core/build.gradle index a749d8f41..78fe55c55 100644 --- a/android/uhabits-core/build.gradle +++ b/android/uhabits-core/build.gradle @@ -6,24 +6,24 @@ dependencies { annotationProcessor "com.google.dagger:dagger:$DAGGER_VERSION" compileOnly 'javax.annotation:jsr250-api:1.0' - compileOnly 'org.jetbrains:annotations-java5:15.0' + compileOnly 'org.jetbrains:annotations:18.0.0' compileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION" compileOnly "com.google.dagger:dagger:$DAGGER_VERSION" implementation "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION" implementation 'com.google.code.findbugs:jsr305:3.0.2' implementation 'org.apache.commons:commons-lang3:3.5' - implementation 'com.google.code.gson:gson:2.7' + implementation 'com.google.code.gson:gson:2.8.5' - testImplementation 'junit:junit:4+' + testImplementation 'junit:junit:4.12' testImplementation 'org.hamcrest:hamcrest-library:1.4-atlassian-1' testImplementation 'org.apache.commons:commons-io:1.3.2' testImplementation 'org.mockito:mockito-core:2.8.9' testImplementation 'org.json:json:20160810' testImplementation 'org.xerial:sqlite-jdbc:3.18.0' - testImplementation 'nl.jqno.equalsverifier:equalsverifier:2.3.1' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:2.4.8' - implementation('com.opencsv:opencsv:3.9') { + implementation('com.opencsv:opencsv:3.10') { exclude group: 'commons-logging', module: 'commons-logging' } }