From 8d063b175b952d70415198fbb52734e0a202d20b Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 15 Nov 2019 13:37:12 +0100 Subject: [PATCH] update dependencies --- OpenKeychain/build.gradle | 53 ++++++++++++++++++++------------------- build.gradle | 2 +- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 132c93aae..3332224f0 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -19,10 +19,10 @@ dependencies { implementation 'com.google.zxing:core:3.3.0' implementation 'org.commonjava.googlecode.markdown4j:markdown4j:2.2-cj-1.1' implementation 'org.sufficientlysecure:donations:2.5' - implementation 'com.squareup.okhttp3:okhttp:3.9.1' + implementation 'com.squareup.okhttp3:okhttp:3.13.1' implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.9.1' - implementation 'org.apache.james:apache-mime4j-core:0.8.0' - implementation 'org.apache.james:apache-mime4j-dom:0.8.0' + implementation 'org.apache.james:apache-mime4j-core:0.8.1' + implementation 'org.apache.james:apache-mime4j-dom:0.8.1' // UI implementation 'org.sufficientlysecure:html-textview:3.1' @@ -32,17 +32,18 @@ dependencies { implementation 'com.cocosw:bottomsheet:1.5.0@aar' // RecyclerView - implementation 'eu.davidea:flexible-adapter:5.0.5' + implementation 'eu.davidea:flexible-adapter:5.1.0' implementation 'eu.davidea:flexible-adapter-ui:1.0.0-b5' implementation 'eu.davidea:flexible-adapter-livedata:1.0.0-b2' // Material Drawer - implementation 'com.mikepenz:materialdrawer:5.6.0@aar' - implementation 'com.mikepenz:fastadapter:1.8.2' - implementation 'com.mikepenz:materialize:1.0.0' - implementation 'com.mikepenz:iconics-core:2.8.1@aar' + implementation 'com.mikepenz:materialdrawer:6.1.2@aar' + implementation 'com.mikepenz:fastadapter:3.3.0' + implementation 'com.mikepenz:fastadapter-extensions-expandable:3.3.0' + implementation 'com.mikepenz:materialize:1.2.0' + implementation 'com.mikepenz:iconics-core:3.1.0@aar' implementation 'com.mikepenz:google-material-typeface:2.2.0.3.original@aar' - implementation 'com.mikepenz:fontawesome-typeface:4.6.0.3@aar' + implementation 'com.mikepenz:fontawesome-typeface:5.3.1.1@aar' implementation 'com.mikepenz:community-material-typeface:1.5.54.2@aar' // Nordpol @@ -66,40 +67,40 @@ dependencies { // https://developer.android.com/training/testing/unit-testing/local-unit-tests.html // http://robolectric.org/getting-started/ // http://www.vogella.com/tutorials/Robolectric/article.html - testCompile 'junit:junit:4.12' + testImplementation 'junit:junit:4.12' testCompile ('org.robolectric:robolectric:3.6.1') { exclude group: 'org.bouncycastle', module: 'bcprov-jdk16' } - testCompile 'org.mockito:mockito-core:1.10.19' + testImplementation 'org.mockito:mockito-core:2.18.0' // UI testing with Espresso // Force usage of support libs in the test app, since they are internally used by the runner module. // https://github.com/googlesamples/android-testing/blob/master/ui/espresso/BasicSample/app/build.gradle#L28 - androidTestCompile 'androidx.annotation:annotation:1.0.0' - androidTestCompile 'androidx.appcompat:appcompat:1.0.0' - androidTestCompile 'com.google.android.material:material:1.0.0' - androidTestCompile 'androidx.test.ext:junit:1.1.1' - androidTestCompile 'androidx.test:rules:1.1.1' - androidTestCompile 'androidx.test.espresso:espresso-core:3.1.0' - androidTestCompile 'androidx.test.espresso:espresso-intents:3.1.0' + androidTestImplementation 'androidx.annotation:annotation:1.1.0' + androidTestImplementation 'androidx.appcompat:appcompat:1.1.0' + androidTestImplementation 'com.google.android.material:material:1.0.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test:rules:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0' androidTestCompile ('androidx.test.espresso:espresso-contrib:3.1.0') { exclude group: 'com.android.support', module: 'appcompat' exclude group: 'com.android.support', module: 'support-v4' exclude module: 'recyclerview-v7' } - implementation "com.jakewharton.timber:timber:4.5.1" + implementation "com.jakewharton.timber:timber:4.7.0" implementation 'org.glassfish:javax.annotation:10.0-b28' - provided "com.google.auto.value:auto-value:1.5" - annotationProcessor "com.google.auto.value:auto-value:1.5" - annotationProcessor "com.ryanharter.auto.value:auto-value-parcel:0.2.5" - implementation 'com.ryanharter.auto.value:auto-value-parcel-adapter:0.2.5' + api "com.google.auto.value:auto-value-annotations:1.6.2" + annotationProcessor "com.google.auto.value:auto-value:1.6.2" + implementation 'com.ryanharter.auto.value:auto-value-parcel-adapter:0.2.6' + annotationProcessor "com.ryanharter.auto.value:auto-value-parcel:0.2.6" - implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' - annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0' + implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' + annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.1.0' - implementation 'androidx.sqlite:sqlite-framework:2.0.0' + implementation 'androidx.sqlite:sqlite-framework:2.0.1' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' // for debugging the db. don't enable by default, this will expose the database no the network! diff --git a/build.gradle b/build.gradle index 03649b02b..c47803a6d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { dependencies { // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:3.5.3' // bintray dependency to satisfy dependency of openpgp-api lib classpath 'com.novoda:bintray-release:0.8.0' classpath 'com.squareup.sqldelight:gradle-plugin:0.8.0'