From 3379a1d85cd63bf4283da2a7d241382d7ce5c75e Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sun, 21 Jan 2018 03:21:35 +0100 Subject: [PATCH] update compile sdk to 27 --- OpenKeychain/build.gradle | 47 +++++++++---------- .../keychain/util/FileHelper.java | 6 ++- build.gradle | 3 +- extern/KeybaseLib | 2 +- extern/openpgp-api-lib | 2 +- extern/safeslinger-exchange | 2 +- libkeychain/build.gradle | 2 +- sshauthentication-api/build.gradle | 2 +- 8 files changed, 35 insertions(+), 31 deletions(-) diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 3dd09db30..d5276364e 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -8,12 +8,12 @@ dependencies { // NOTE: libraries are pinned to a specific build, see below // from local Android SDK - compile 'com.android.support:support-v4:25.3.1' - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:design:25.3.1' - compile 'com.android.support:recyclerview-v7:25.3.1' - compile 'com.android.support:cardview-v7:25.3.1' - compile 'com.android.support:support-annotations:25.3.1' + compile 'com.android.support:support-v4:27.0.2' + compile 'com.android.support:appcompat-v7:27.0.2' + compile 'com.android.support:design:27.0.2' + compile 'com.android.support:recyclerview-v7:27.0.2' + compile 'com.android.support:cardview-v7:27.0.2' + compile 'com.android.support:support-annotations:27.0.2' // JCenter etc. compile 'com.journeyapps:zxing-android-embedded:3.4.0' @@ -74,9 +74,9 @@ dependencies { // 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 'com.android.support:support-annotations:25.3.1' - androidTestCompile 'com.android.support:appcompat-v7:25.3.1' - androidTestCompile 'com.android.support:design:25.3.1' + androidTestCompile 'com.android.support:support-annotations:27.0.2' + androidTestCompile 'com.android.support:appcompat-v7:27.0.2' + androidTestCompile 'com.android.support:design:27.0.2' androidTestCompile 'com.android.support.test:runner:0.5' androidTestCompile 'com.android.support.test:rules:0.5' androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2' @@ -94,37 +94,36 @@ dependencies { annotationProcessor "com.google.auto.value:auto-value:1.5" annotationProcessor "com.ryanharter.auto.value:auto-value-parcel:0.2.5" compile 'com.ryanharter.auto.value:auto-value-parcel-adapter:0.2.5' - } // Output of ./gradlew -q calculateChecksums // Comment out the libs referenced as git submodules! dependencyVerification { verify = [ - 'com.android.support:design:a3e83064fe99d0a4369f9b46d8bfbe77d0c3022fffdee4be3ac3857b87cc89e3', + 'com.android.support:design:fa5c27a705310e95a8f4099c98777132ed901a0d69178942306bb34cd76f0d57', 'com.journeyapps:zxing-android-embedded:2422d83c2c09a7b645f516c8458ececba6a7da47b94e40778d876facf495c660', 'org.sufficientlysecure:donations:2be4183afa5e35263e37346344cfea48681f3c987e6832dd4acde227c13ccad6', - 'com.android.support:transition:36c688825a8c0e6e879e18886de83dc90673322822d5b606ee302f70fb558e16', + 'com.android.support:support-v4:1b2b37169fcccfef5e563d273749e3792decdce9818bc17932403a2363f537b4', 'com.futuremind.recyclerfastscroll:fastscroll:ae655201885a9dbb5fabecb4adfefbb23ffdbca26a2b4ea255ec1bf6f214c606', 'com.mikepenz:fastadapter:21d4ecb5c128bcda37b14e7998d799ed52cfc768b72cdf3d5578bb6775769ebd', 'com.mikepenz:materialize:942ccf5e2aa1a46803aa884e8dc7bbaf2a9e8e9996a0cf92e3fe2f44a8592ba4', - 'com.android.support:appcompat-v7:ac1ebbc46589195dda3e0b1becfe410bafd75bdf3edd1cd9acf04850f3895830', - 'com.android.support:support-v4:07d389154bcf73b47e514964df1578136b26cba78257b8a577a3ccb54beff0ae', + 'com.android.support:appcompat-v7:b2825e8b47f665d3362d8481c8d147d1af9230d16f23a2b94f6ccbc53c68cec1', 'com.nispok:snackbar:46b5eb9d630d329e13c2ce00ee9fb115ffb66c23c72cff32ee97eedd76824c6f', 'com.tonicartos:superslim:ca89b5c674660cc6918a8f8fd385065bffeee27983e0d33c7c2f0ad7b34d2d49', - 'com.android.support:recyclerview-v7:375974a8724e359d97d77fa8522c614f813a3ac4583c1807f154a3f9a054b0a1', - 'com.android.support:cardview-v7:defc17032ffa600a82e1c7d96bb574aa5ed64e2b57e28414a245da7d6db0c666', + 'com.android.support:recyclerview-v7:3eb953930f10941f2b0447ec123a9b03d2746a42a99c523e82c3ece3308ca70b', + 'com.android.support:cardview-v7:57f867a3c8f33e2d4dc0a03e2dfa03cad6267a908179f04a725a68ea9f0b8ccf', 'org.sufficientlysecure:html-textview:ed740adf05cae2373999c7a3047c803183d9807b2cf66162902090d7c112a832', 'com.getbase:floatingactionbutton:3edefa511aac4d90794c7b0496aca59cff2eee1e32679247b4f85acbeee05240', - 'com.android.support:support-fragment:541d6393c1e024453aca2a14f31bea0c7270ff4e2a02783f3528aa426367444d', - 'com.android.support:support-media-compat:cbed07d07e0e84fdb4b75712f5fd946229a8af155933c9a92e41db64d00791e0', - 'com.android.support:support-core-utils:32fac02eb2c20a77fa3e3bc3ede62392a19613f72b8f8e10f5dfa84bb4c89ea1', + 'com.android.support:transition:1a7db0453c1467fc8fd815e6d50ca6bb475a7a9ba6b5f3b307329688a7c62a68', + 'com.android.support:support-media-compat:6dd9327ee9aa467cab479aad97df375072b2b6ba61eadffdaa5a88de3843c457', + 'com.android.support:support-fragment:e4358388022a2205777575a7251fe357334658e4123d5d6e3b082f5899d9b011', + 'com.android.support:support-core-utils:b69c6e1e7731b876b910fc7100bcadf40a57f27b32ca26b91400995542112c96', 'com.jpardogo.materialtabstrip:library:4ee2f1211c302b45fb8c627cc5b240dc6b38b7aaaab1b8bffc81663e1b108013', - 'com.android.support:support-core-ui:6182278a6653e6c111c888963626cbb16f2d0022571cb239760475119e0b92a8', - 'com.android.support:animated-vector-drawable:4bc46edf1946b32d518b41416d1734e915e0cbb28021de3b340527419b070691', - 'com.android.support:support-vector-drawable:13728f337f36d1c02d52198a6c20724edb447a0875454d829f95cb9eb4aa293b', - 'com.android.support:support-compat:e02d781268dc60aab6638d8dc20156ea11ca20b962d294b85e6f1e8418cabfa7', - 'com.android.support:support-annotations:aedf76962584adfaed2bd3fcaa22406461c4310237fc27e301128edaa2dba2fa', + 'com.android.support:animated-vector-drawable:5b117a2c13a898c2a3c84c480d64edcfac2ef720aa9b742c29249fac774ffc48', + 'com.android.support:support-core-ui:2284072511a95d504c074de80c82cd33724c6d2754117833b98ba3a09994163e', + 'com.android.support:support-vector-drawable:bf4f4fcbf58b1380616581224e6487c230bfdb3434ec353d4adaa4b1f4865cfa', + 'com.android.support:support-compat:ed4d25d91a0b13d8b9def1c0de69ed03d7fb89d50fb37eb0e9b63b0cf7a42357', + 'com.android.support:support-annotations:af05330d997eb92a066534dbe0a3ea24347d26d7001221092113ae02a8f233da', 'com.google.zxing:core:bba7724e02a997cec38213af77133ee8e24b0d5cf5fa7ecbc16a4fa93f11ee0d', 'org.commonjava.googlecode.markdown4j:markdown4j:28eb991f702c6d85d6cafd68c24d1ce841d1f5c995c943f25aedb433c0c13f60', 'org.ocpsoft.prettytime:prettytime:ef7098d973ae78b57d1a22dc37d3b8a771bf030301300e24055d676b6cdc5e75', diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java index 9aa6a94ba..0cf352fdf 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java @@ -218,7 +218,11 @@ public class FileHelper { */ public static Bitmap getThumbnail(Context context, Uri uri, Point size) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - return DocumentsContract.getDocumentThumbnail(context.getContentResolver(), uri, size, null); + try { + return DocumentsContract.getDocumentThumbnail(context.getContentResolver(), uri, size, null); + } catch (FileNotFoundException e) { + return null; + } } else { return null; } diff --git a/build.gradle b/build.gradle index 835a4aa35..9e33ba987 100644 --- a/build.gradle +++ b/build.gradle @@ -51,5 +51,6 @@ project(':extern:bouncycastle') { // SDK Version and Build Tools used by all subprojects // See http://tools.android.com/tech-docs/new-build-system/tips#TOC-Controlling-Android-properties-of-all-your-modules-from-the-main-project. ext { - compileSdkVersion = 25 + compileSdkVersion = 27 + buildToolsVersion = '27.0.3' } diff --git a/extern/KeybaseLib b/extern/KeybaseLib index 8d8bc2117..476fc52a7 160000 --- a/extern/KeybaseLib +++ b/extern/KeybaseLib @@ -1 +1 @@ -Subproject commit 8d8bc2117438fb789beaf4040be174683990e84e +Subproject commit 476fc52a7e59a490d89b8e15f96f5c8535c20328 diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib index 5f391388f..dca29e1dd 160000 --- a/extern/openpgp-api-lib +++ b/extern/openpgp-api-lib @@ -1 +1 @@ -Subproject commit 5f391388fba5a6be31a219fda6e48757263845fa +Subproject commit dca29e1dd3aa845ca39f8c1b6cf0c39e9d8ab78b diff --git a/extern/safeslinger-exchange b/extern/safeslinger-exchange index c88080e9d..e98ff43e5 160000 --- a/extern/safeslinger-exchange +++ b/extern/safeslinger-exchange @@ -1 +1 @@ -Subproject commit c88080e9d1367487490c13cb12321231f6edb068 +Subproject commit e98ff43e52a146bac8b7765473f02828816f00c4 diff --git a/libkeychain/build.gradle b/libkeychain/build.gradle index a6a30c8d8..380bfbd80 100644 --- a/libkeychain/build.gradle +++ b/libkeychain/build.gradle @@ -5,7 +5,7 @@ dependencies { // NOTE: libraries are pinned to a specific build, see below // from local Android SDK - compile 'com.android.support:support-v4:25.0.1' + compile 'com.android.support:support-v4:27.0.2' // libs as submodules compile project(':openpgp-api-lib') // TODO: get rid of this dependency diff --git a/sshauthentication-api/build.gradle b/sshauthentication-api/build.gradle index 33ea1b5b8..ebdd61ca6 100644 --- a/sshauthentication-api/build.gradle +++ b/sshauthentication-api/build.gradle @@ -15,7 +15,7 @@ android { if (project.hasProperty('rootProject.ext.compileSdkVersion')) { compileSdkVersion rootProject.ext.compileSdkVersion } else { - compileSdkVersion 25 + compileSdkVersion 27 } if (project.hasProperty('rootProject.ext.buildToolsVersion')) { buildToolsVersion rootProject.ext.buildToolsVersion