Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated dependencies #3423

Merged
merged 4 commits into from
Nov 5, 2019
Merged

Updated dependencies #3423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b88c51e
Updated dependencies
grzesiek2010 Oct 28, 2019
fb2135a
Removed unused imports
grzesiek2010 Oct 31, 2019
89c4c18
Suppressed NewApi lint in CameraUtils
grzesiek2010 Oct 31, 2019
05d5c22
Removed unused dependencies
grzesiek2010 Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ buildscript {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.google.gms:google-services:4.3.2'
classpath 'org.ow2.asm:asm:7.2-beta' // https://github.com/jacoco/jacoco/issues/639#issuecomment-355424756
classpath 'org.jacoco:org.jacoco.core:0.8.4'
classpath 'io.fabric.tools:gradle:1.31.0'
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 @@ -48,6 +48,6 @@ task checkTests(type: GradleBuild) {

ext {
leakyCanaryVersion = '1.6.3'
daggerVersion = '2.24'
daggerVersion = '2.25.2'
okhttp3Version = '3.12.5' //newer versions require minSdkVersion >= 21
}
48 changes: 18 additions & 30 deletions collect_app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,51 +209,39 @@ dependencies {
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-core:17.2.0"
implementation "com.google.firebase:firebase-core:17.2.1"
implementation "com.crashlytics.sdk.android:crashlytics:2.10.1"

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

implementation("com.google.guava:guava:28.1-android")

implementation("com.google.code.gson:gson:2.8.5") {
exclude group: 'org.apache.httpcomponents'
}

implementation("com.google.http-client:google-http-client:1.31.0") {
exclude group: 'org.apache.httpcomponents'
}
implementation("com.google.oauth-client:google-oauth-client:1.30.1") {
exclude group: 'org.apache.httpcomponents'
}

implementation "com.squareup.okhttp3:okhttp:${rootProject.okhttp3Version}"
implementation 'com.burgstaller:okhttp-digest:1.18' //newer versions require minSdkVersion >= 21

implementation 'com.github.mohamadian:PersianJodaTime:1.2'
implementation 'com.github.chanmratekoko:myanmar-calendar:1.0.6.RC3'
implementation 'bikramsambat:bikram-sambat:1.1.0'
implementation "com.evernote:android-job:1.3.0-rc1"
implementation "com.evernote:android-job:1.4.2"
implementation "com.rarepebble:colorpicker:3.0.1"
implementation "commons-io:commons-io:2.6"
implementation "net.sf.kxml:kxml2:2.3.0"
implementation "net.sf.opencsv:opencsv:2.4"
implementation("org.opendatakit:opendatakit-javarosa:2.17.0") {
exclude group: 'joda-time'
exclude group: 'org.slf4j'
}
implementation "com.karumi:dexter:5.0.0"
implementation "com.karumi:dexter:6.0.0"
implementation "org.osmdroid:osmdroid-android:5.6.4"
implementation("com.google.api-client:google-api-client-android:1.30.2") {
implementation("com.google.api-client:google-api-client-android:1.30.5") {
exclude group: 'org.apache.httpcomponents'
exclude group: 'com.google.guava'
}
implementation("com.google.apis:google-api-services-drive:v3-rev20190822-1.30.1") {
implementation("com.google.apis:google-api-services-drive:v3-rev20190926-1.30.3") {
exclude group: 'org.apache.httpcomponents'
exclude group: 'com.google.guava'
}
implementation("com.google.apis:google-api-services-sheets:v4-rev20190813-1.30.1") {
implementation("com.google.apis:google-api-services-sheets:v4-rev20191001-1.30.3") {
exclude group: 'org.apache.httpcomponents'
exclude group: 'com.google.guava'
}
Expand All @@ -264,7 +252,7 @@ dependencies {

implementation "com.google.zxing:core:3.3.0" //updating to 3.4.0 requires minSdkVersion >=24 https://github.com/zxing/zxing/releases/tag/zxing-3.4.0
implementation "com.journeyapps:zxing-android-embedded:3.5.0" //updating would require minSdkVersion >=24
implementation "net.danlew:android.joda:2.10.2"
implementation "net.danlew:android.joda:2.10.3"

// Real LeakCanary for debug builds only: notifications, analysis, etc
debugImplementation "com.squareup.leakcanary:leakcanary-android:${rootProject.leakyCanaryVersion}"
Expand All @@ -289,7 +277,7 @@ dependencies {

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

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

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

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

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

testImplementation "org.robolectric:robolectric:4.3"
testImplementation "org.robolectric:shadows-multidex:4.3"
testImplementation "org.robolectric:robolectric:4.3.1"
testImplementation "org.robolectric:shadows-multidex:4.3.1"
testImplementation "com.squareup.okhttp3:mockwebserver:${rootProject.okhttp3Version}"
testImplementation "com.squareup.okhttp3:okhttp-tls:${rootProject.okhttp3Version}"

// power mock (for mocking final methods which is not handled by mockito)
testImplementation "org.powermock:powermock-module-junit4:2.0.2"
testImplementation "org.powermock:powermock-api-mockito2:2.0.2"
testImplementation "org.powermock:powermock-module-junit4:2.0.4"
testImplementation "org.powermock:powermock-api-mockito2:2.0.4"

testImplementation "androidx.arch.core:core-testing:2.0.1"
testImplementation "androidx.arch.core:core-testing:2.1.0"

androidTestImplementation "org.mockito:mockito-android:3.0.0"
androidTestImplementation "org.mockito:mockito-android:3.1.0"
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
2 changes: 2 additions & 0 deletions collect_app/src/main/java/org/odk/collect/android/utilities/CameraUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
limitations under the License.
*/

import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.hardware.Camera;
Expand Down Expand Up @@ -108,6 +109,7 @@ public static void savePhoto(String path, byte[] data) {
}
}

@SuppressLint("NewApi")
public static boolean isFrontCameraAvailable() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
try {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
android.enableD8.desugaring=true
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
# Android Studio Gradle wrapper >= 3.1.2 doesn't support configure on demand
org.gradle.configureondemand=false