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 6ab83e596..000000000 Binary files a/libs/gradle-witness.jar and /dev/null differ 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