Skip to content

Commit

Permalink
Updated dependencies (getodk#3555)
Browse files Browse the repository at this point in the history
  • Loading branch information
grzesiek2010 authored and lognaturel committed Dec 20, 2019
1 parent 5bd7d8a commit dc1f29f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ buildscript {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.google.gms:google-services:4.3.2'
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'org.ow2.asm:asm:7.2' // https://github.com/jacoco/jacoco/issues/639#issuecomment-355424756
classpath 'org.jacoco:org.jacoco.core:0.8.5'
classpath 'io.fabric.tools:gradle:1.31.2'
Expand Down Expand Up @@ -49,6 +49,6 @@ task checkTests(type: GradleBuild) {

ext {
leakyCanaryVersion = '1.6.3'
daggerVersion = '2.25.2'
daggerVersion = '2.25.3'
okhttp3Version = '3.12.5' //newer versions require minSdkVersion >= 21
}
26 changes: 13 additions & 13 deletions collect_app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -198,22 +198,22 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])

implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'androidx.browser:browser:1.2.0-alpha07'
implementation 'androidx.browser:browser:1.2.0'
implementation 'androidx.appcompat:appcompat:1.1.0-rc01' // Shouldn't be upgraded until https://issuetracker.google.com/issues/141869006 is fixed
implementation 'com.google.android.material:material:1.1.0-alpha10'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.exifinterface:exifinterface:1.1.0-beta01'
implementation 'androidx.exifinterface:exifinterface:1.1.0'
implementation "androidx.multidex:multidex:2.0.1"

implementation "com.google.android.gms:play-services-auth:17.0.0"
implementation "com.google.android.gms:play-services-maps:17.0.0"
implementation "com.google.android.gms:play-services-location:17.0.0"

implementation 'com.google.firebase:firebase-perf:19.0.2'
implementation 'com.google.firebase:firebase-perf:19.0.4'
implementation 'com.google.firebase:firebase-analytics:17.2.1'
implementation "com.crashlytics.sdk.android:crashlytics:2.10.1"

implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:8.4.0'
implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:8.6.0'
implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v7:0.6.0'

implementation("com.google.guava:guava:28.1-android")
Expand All @@ -232,17 +232,17 @@ dependencies {
exclude group: 'joda-time'
exclude group: 'org.slf4j'
}
implementation "com.karumi:dexter:6.0.0"
implementation "com.karumi:dexter:6.0.1"
implementation "org.osmdroid:osmdroid-android:5.6.4"
implementation("com.google.api-client:google-api-client-android:1.30.5") {
implementation("com.google.api-client:google-api-client-android:1.30.7") {
exclude group: 'org.apache.httpcomponents'
exclude group: 'com.google.guava'
}
implementation("com.google.apis:google-api-services-drive:v3-rev20190926-1.30.3") {
implementation("com.google.apis:google-api-services-drive:v3-rev20191108-1.30.3") {
exclude group: 'org.apache.httpcomponents'
exclude group: 'com.google.guava'
}
implementation("com.google.apis:google-api-services-sheets:v4-rev20191001-1.30.3") {
implementation("com.google.apis:google-api-services-sheets:v4-rev20191213-1.30.3") {
exclude group: 'org.apache.httpcomponents'
exclude group: 'com.google.guava'
}
Expand Down Expand Up @@ -278,7 +278,7 @@ dependencies {

// RxJava 2:
implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
implementation "io.reactivex.rxjava2:rxjava:2.2.13"
implementation "io.reactivex.rxjava2:rxjava:2.2.16"

// Better "Subjects" for Rx:
implementation "com.jakewharton.rxrelay2:rxrelay:2.1.1"
Expand All @@ -293,8 +293,8 @@ dependencies {
}

// Makes binding to Views easy:
implementation "com.jakewharton:butterknife:10.2.0"
annotationProcessor "com.jakewharton:butterknife-compiler:10.2.0"
implementation "com.jakewharton:butterknife:10.2.1"
annotationProcessor "com.jakewharton:butterknife-compiler:10.2.1"

// Annotations understood by FindBugs
compileOnly 'com.google.code.findbugs:annotations:3.0.1'
Expand All @@ -305,7 +305,7 @@ dependencies {

// Testing-only dependencies
testImplementation "junit:junit:4.13-beta-3"
testImplementation "org.mockito:mockito-core:3.1.0"
testImplementation "org.mockito:mockito-core:3.2.4"

testImplementation "org.robolectric:robolectric:4.3.1"
testImplementation "org.robolectric:shadows-multidex:4.3.1"
Expand All @@ -320,7 +320,7 @@ dependencies {

testImplementation "org.json:json:20190722"

androidTestImplementation "org.mockito:mockito-android:3.1.0"
androidTestImplementation "org.mockito:mockito-android:3.2.4"
androidTestImplementation("androidx.test:runner:1.3.0-alpha02") {
exclude group: 'com.android.support', module: 'support-annotations'
exclude group: 'com.google.code.findbugs', module: 'jsr305'
Expand Down

0 comments on commit dc1f29f

Please sign in to comment.