From ea6144d963b96aae472db16596013ef8c5d602d2 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 5 Mar 2019 21:12:55 +0100 Subject: [PATCH] updates gradle syntax, integrates map dependency and removes gradleWitness until 'implementation' is supported --- build.gradle | 131 +++++------------- libs/gradle-witness.jar | Bin 16693 -> 0 bytes .../securesms/ApplicationContext.java | 2 + 3 files changed, 39 insertions(+), 94 deletions(-) delete mode 100644 libs/gradle-witness.jar diff --git a/build.gradle b/build.gradle index 4c031e834..207ff3683 100644 --- a/build.gradle +++ b/build.gradle @@ -11,12 +11,10 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.0.1' - classpath files('libs/gradle-witness.jar') } } apply plugin: 'com.android.application' -apply plugin: 'witness' // for dependencyVerification repositories { google() @@ -30,116 +28,60 @@ repositories { } dependencies { - compile 'com.android.support:appcompat-v7:27.0.2' // one use in SearchToolbar. - compile 'com.android.support:design:27.0.2' // used in various locations for a lot of components - compile 'com.android.support:support-v13:27.0.2' // used to prevent a 25... version to be loaded (from where ever) - compile 'com.android.support:preference-v7:27.0.2' // actually a dependency of -v14 - compile 'com.android.support:preference-v14:27.0.2' // used to manage the users preferences - compile 'com.android.support:exifinterface:27.0.2' // Used to edit the Exif in BitmapUtil - compile 'com.android.support.constraint:constraint-layout:1.1.2' // Used in several places - compile 'android.arch.lifecycle:extensions:1.1.1' // Used in situations where data changes should be displayed directly (e.G. Search) - compile 'android.arch.lifecycle:common-java8:1.1.1' // Used in situations where data changes should be displayed directly (e.G. Search) + implementation 'com.android.support:appcompat-v7:27.1.1' // one use in SearchToolbar. + implementation 'com.android.support:design:27.1.1' // used in various locations for a lot of components + implementation 'com.android.support:support-v13:27.1.1' // used to prevent a 25... version to be loaded (from where ever) + implementation 'com.android.support:preference-v7:27.1.1' // actually a dependency of -v14 + implementation 'com.android.support:preference-v14:27.1.1' // used to manage the users preferences + implementation 'com.android.support:exifinterface:27.1.1' // Used to edit the Exif in BitmapUtil + implementation 'com.android.support.constraint:constraint-layout:1.1.2' // Used in several places + implementation 'android.arch.lifecycle:extensions:1.1.1' // Used in situations where data changes should be displayed directly (e.G. Search) + implementation 'android.arch.lifecycle:common-java8:1.1.1' // Used in situations where data changes should be displayed directly (e.G. Search) - compile 'com.google.android.exoplayer:exoplayer:r2.3.1' // plays video. + implementation 'com.google.android.exoplayer:exoplayer:r2.3.1' // plays video. - compile 'com.fasterxml.jackson.core:jackson-databind:2.9.5' // used as JSON library TODO: check if java builtin would work as well + implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.5' // used as JSON library TODO: check if java builtin would work as well - compile 'com.journeyapps:zxing-android-embedded:3.4.0' // QR Code scanner + implementation 'com.journeyapps:zxing-android-embedded:3.4.0' // QR Code scanner - compile "me.leolin:ShortcutBadger:1.1.16" // display messagecount on the home screen icon. - compile 'com.jpardogo.materialtabstrip:library:1.0.9' // used in the emoji selector for the tab selection. - compile 'com.github.chrisbanes:PhotoView:2.1.3' // does the zooming on photos / media - compile 'com.github.bumptech.glide:glide:4.5.0' + implementation "me.leolin:ShortcutBadger:1.1.16" // display messagecount on the home screen icon. + implementation 'com.jpardogo.materialtabstrip:library:1.0.9' // used in the emoji selector for the tab selection. + implementation 'com.github.chrisbanes:PhotoView:2.1.3' // does the zooming on photos / media + implementation 'com.github.bumptech.glide:glide:4.5.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0' - compile 'com.makeramen:roundedimageview:2.1.0' // crops the avatars to circles - compile 'com.pnikosis:materialish-progress:1.5' // used only in the "Progress Wheel" in Share Activity. - compile 'com.soundcloud.android:android-crop:0.9.10@aar' // used in Group Select Avatar, should be unified with profie - compile 'com.nineoldandroids:library:2.4.0' // DEPRECATED! Used to slide in the half-camera. - compile 'mobi.upod:time-duration-picker:1.1.3' // Used to pick the time for inactivity. - compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' // number of unread messages, + implementation 'com.makeramen:roundedimageview:2.1.0' // crops the avatars to circles + implementation 'com.pnikosis:materialish-progress:1.5' // used only in the "Progress Wheel" in Share Activity. + implementation 'com.soundcloud.android:android-crop:0.9.10@aar' // used in Group Select Avatar, should be unified with profie + implementation 'com.nineoldandroids:library:2.4.0' // DEPRECATED! Used to slide in the half-camera. + implementation 'mobi.upod:time-duration-picker:1.1.3' // Used to pick the time for inactivity. + implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' // number of unread messages, // the one-letter circle for the contacts (when there is not avatar) and a white background. - compile 'com.google.zxing:core:3.2.1' // QR Code scanner - compile ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') { // for the zooming on photos / media + implementation 'com.google.zxing:core:3.2.1' // QR Code scanner + implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') { // for the zooming on photos / media exclude group: 'com.android.support', module: 'support-annotations' } - compile 'com.annimon:stream:1.1.8' // brings future java streams api to SDK Version < 24 - compile 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4' // glues the current time segment text in the gallery to the top. + implementation 'com.annimon:stream:1.1.8' // brings future java streams api to SDK Version < 24 + implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4' // glues the current time segment text in the gallery to the top. + implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:7.2.0' - testCompile 'junit:junit:4.12' - testCompile 'org.assertj:assertj-core:1.7.1' - testCompile 'org.mockito:mockito-core:1.9.5' - testCompile 'org.powermock:powermock-api-mockito:1.6.1' - testCompile 'org.powermock:powermock-module-junit4:1.6.1' - testCompile 'org.powermock:powermock-module-junit4-rule:1.6.1' - testCompile 'org.powermock:powermock-classloading-xstream:1.6.1' + testImplementation 'junit:junit:4.12' + testImplementation 'org.assertj:assertj-core:1.7.1' + testImplementation 'org.mockito:mockito-core:1.9.5' + testImplementation 'org.powermock:powermock-api-mockito:1.6.1' + testImplementation 'org.powermock:powermock-module-junit4:1.6.1' + testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1' + testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1' - androidTestCompile ('org.assertj:assertj-core:1.7.1') { + androidTestImplementation ('org.assertj:assertj-core:1.7.1') { exclude group: 'org.hamcrest', module: 'hamcrest-core' } } -dependencyVerification { - // used by the witness plugin to verifiy dependencies. - // to update the list, call `./gradlew -q calculateChecksums` and paste the result here. - verify = [ - 'com.android.support:design:fa5c27a705310e95a8f4099c98777132ed901a0d69178942306bb34cd76f0d57', - 'com.android.support:preference-v14:1fcf40bd560dc21ce55b6a292d1326d28f52dc5e4f2a64eef2f38dd95777b645', - 'com.android.support:preference-v7:d9f32ddc92f8d6a0bd86a18f4fcaff805fa021245e395b6e7dd382907443ee53', - 'com.pnikosis:materialish-progress:d71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54', - 'mobi.upod:time-duration-picker:db469ce0f48dd96b892eac424ed76870e54bf00fe0a28cdcddfbe5f2a226a0e1', - 'com.codewaves.stickyheadergrid:stickyheadergrid:5b4aa6a52a957cfd55f60f4220c11c0c371385a3cb9786cae03c260dcdef5794', - 'com.android.support:appcompat-v7:b2825e8b47f665d3362d8481c8d147d1af9230d16f23a2b94f6ccbc53c68cec1', - 'com.android.support:support-v13:6f2848811ceef2e32cc98da02a045d65f7e7447a6bd7198b9ec10aa14d7ad55c', - 'com.android.support:exifinterface:0e7cd526c4468895cd8549def46b3d33c8bcfb1ae4830569898d8c7326b15bb2', - 'com.android.support.constraint:constraint-layout:839a7e16fc50adfabaa8cb753e675ed63f94e1e91ba9115ce43b0d6a37fe8aa6', - 'android.arch.lifecycle:extensions:429426b2feec2245ffc5e75b3b5309bedb36159cf06dc71843ae43526ac289b6', - 'android.arch.lifecycle:common-java8:7078b5c8ccb94203df9cc2a463c69cf0021596e6cf966d78fbfd697aaafe0630', - 'com.google.android.exoplayer:exoplayer:955085aa611a8f7cf6c61b88ae03d1a392f4ad94c9bfbc153f3dedb9ffb14718', - 'com.fasterxml.jackson.core:jackson-databind:0fb4e079c118e752cc94c15ad22e6782b0dfc5dc09145f4813fb39d82e686047', - 'com.journeyapps:zxing-android-embedded:2422d83c2c09a7b645f516c8458ececba6a7da47b94e40778d876facf495c660', - 'me.leolin:ShortcutBadger:e3cb3e7625892129b0c92dd5e4bc649faffdd526d5af26d9c45ee31ff8851774', - 'com.jpardogo.materialtabstrip:library:c6ef812fba4f74be7dc4a905faa4c2908cba261a94c13d4f96d5e67e4aad4aaa', - 'com.github.chrisbanes:PhotoView:7f12b0a9f24b132fc743861ab8f045625faa95c8357887a5fac58fa34a3759e4', - 'com.github.bumptech.glide:glide:997de7ac95be6c944d3b8cbe13de11307736ea45451c1b09a6cec7c328ead59f', - 'com.makeramen:roundedimageview:1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1', - 'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177', - 'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a', - 'com.amulyakhare:com.amulyakhare.textdrawable:54c92b5fba38cfd316a07e5a30528068f45ce8515a6890f1297df4c401af5dcb', - 'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259', - 'com.davemorrissey.labs:subsampling-scale-image-view:550c5baa07e0bb4ff0a18b705e96d34436d22619248bd8c08c08c730b1f55cfe', - 'com.annimon:stream:5da6e2e3e0551d61a3ea7014f04312276549e3dd739cf637996e4cf43c5535b9', - 'com.android.support:transition:1a7db0453c1467fc8fd815e6d50ca6bb475a7a9ba6b5f3b307329688a7c62a68', - 'android.arch.lifecycle:livedata:50ab0490c1ff1a7cfb4e554032998b080888946d0dd424f39900efc4a1bcd750', - 'android.arch.lifecycle:livedata-core:d6fdd8b985d6178d7ea2f16986a24e83f1bee936b74d43167c69e08d3cc12c50', - 'android.arch.core:runtime:c3215aa5873311b3f88a6f4e4a3c25ad89971bc127de8c3e1291c57f93a05c39', - 'com.android.support:support-v4:1b2b37169fcccfef5e563d273749e3792decdce9818bc17932403a2363f537b4', - 'com.android.support:support-fragment:e4358388022a2205777575a7251fe357334658e4123d5d6e3b082f5899d9b011', - 'com.android.support:animated-vector-drawable:5b117a2c13a898c2a3c84c480d64edcfac2ef720aa9b742c29249fac774ffc48', - 'com.android.support:recyclerview-v7:3eb953930f10941f2b0447ec123a9b03d2746a42a99c523e82c3ece3308ca70b', - 'com.android.support:support-core-ui:2284072511a95d504c074de80c82cd33724c6d2754117833b98ba3a09994163e', - 'com.android.support:support-media-compat:6dd9327ee9aa467cab479aad97df375072b2b6ba61eadffdaa5a88de3843c457', - 'com.android.support:support-core-utils:b69c6e1e7731b876b910fc7100bcadf40a57f27b32ca26b91400995542112c96', - 'com.android.support:support-vector-drawable:bf4f4fcbf58b1380616581224e6487c230bfdb3434ec353d4adaa4b1f4865cfa', - 'com.android.support:support-compat:ed4d25d91a0b13d8b9def1c0de69ed03d7fb89d50fb37eb0e9b63b0cf7a42357', - 'android.arch.lifecycle:runtime:c4e4be66c1b2f0abec593571454e1de14013f7e0f96bf2a9f212931a48cae550', - 'android.arch.core:common:3a616a32f433e9e23f556b38575c31b013613d3ae85206263b7625fe1f4c151a', - 'android.arch.lifecycle:common:8d378e88ebd5189e09eef623414812c868fd90aa519d6160e2311fb8b81cff56', - 'android.arch.lifecycle:viewmodel:7de29cfaba77d6b5d5be234c57f6812d0150d087e63941af22ba1d1f8e2bc96a', - 'com.github.bumptech.glide:gifdecoder:59ccf3bb0cec11dab4b857382cbe0b171111b6fc62bf141adce4e1180889af15', - 'com.android.support:support-annotations:af05330d997eb92a066534dbe0a3ea24347d26d7001221092113ae02a8f233da', - 'com.android.support.constraint:constraint-layout-solver:55f82d93e188b5183b71f4f3bace5725c900b737c3514c841114e225627ff88f', - 'com.fasterxml.jackson.core:jackson-annotations:45d32ac61ef8a744b464c54c2b3414be571016dd46bfc2bec226761cf7ae457a', - 'com.fasterxml.jackson.core:jackson-core:a2bebaa325ad25455b02149c67e6052367a7d7fc1ce77de000eed284a5214eac', - 'com.github.bumptech.glide:disklrucache:c1b1b6f5bbd01e2fcdc9d7f60913c8d338bdb65ed4a93bfa02b56f19daaade4b', - 'com.github.bumptech.glide:annotations:bede99ef9f71517a4274bac18fd3e483e9f2b6108d7d6fe8f4949be4aa4d9512', - ] -} - android { flavorDimensions "none" compileSdkVersion 27 - buildToolsVersion '27.0.1' + buildToolsVersion '27.0.3' useLibrary 'org.apache.http.legacy' defaultConfig { @@ -157,6 +99,7 @@ android { project.ext.set("archivesBaseName", "deltachat"); buildConfigField "boolean", "DEV_BUILD", "false" + buildConfigField "String", "MAP_ACCESS_TOKEN", '"pk.eyJ1IjoiZGVsdGFjaGF0IiwiYSI6ImNqc3c1aWczMzBjejY0M28wZmU0a3cwMzMifQ.ZPTH9dFJaav06RAu4rTYHw"' ndk { abiFilters "armeabi", "armeabi-v7a", "x86" diff --git a/libs/gradle-witness.jar b/libs/gradle-witness.jar deleted file mode 100644 index 6ab83e596258e069a075bcee5d353177160aae2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16693 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 Az5oCK diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java index 490b79296..eb277987d 100644 --- a/src/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/org/thoughtcrime/securesms/ApplicationContext.java @@ -26,6 +26,7 @@ import android.support.annotation.NonNull; import com.b44t.messenger.DcContext; import com.b44t.messenger.DcEventCenter; +import com.mapbox.mapboxsdk.Mapbox; import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.crypto.PRNGFixes; @@ -71,6 +72,7 @@ public class ApplicationContext extends Application implements DefaultLifecycleO initializeJobManager(); initializeIncomingMessageNotifier(); ProcessLifecycleOwner.get().getLifecycle().addObserver(this); + Mapbox.getInstance(getApplicationContext(), BuildConfig.MAP_ACCESS_TOKEN); } @Override