From bef9beff164b5adaac7465c36b442894a23db405 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 25 Jan 2019 18:23:00 -0800 Subject: [PATCH] Updated Gradle to 5.1 --- Dockerfile | 2 +- build.gradle | 101 ++++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- libs/gradle-witness.jar | Bin 16693 -> 16689 bytes res/menu/share.xml | 8 -- .../thoughtcrime/securesms/ShareActivity.java | 16 --- 6 files changed, 56 insertions(+), 73 deletions(-) delete mode 100644 res/menu/share.xml diff --git a/Dockerfile b/Dockerfile index 3074dcc967..42f7671bc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN dpkg --add-architecture i386 && \ ENV ANDROID_SDK_FILENAME android-sdk_r24.4.1-linux.tgz ENV ANDROID_SDK_URL https://dl.google.com/android/${ANDROID_SDK_FILENAME} ENV ANDROID_API_LEVELS android-28 -ENV ANDROID_BUILD_TOOLS_VERSION 27.0.3 +ENV ANDROID_BUILD_TOOLS_VERSION 28.0.3 ENV ANDROID_HOME /usr/local/android-sdk-linux ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools RUN cd /usr/local/ && \ diff --git a/build.gradle b/build.gradle index 706ab3d201..7b28540a8a 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.3.0' classpath files('libs/gradle-witness.jar') } } @@ -23,35 +23,38 @@ apply plugin: 'com.android.application' apply plugin: 'witness' repositories { - maven { - url "https://repo1.maven.org/maven2/" - } - maven { - url "https://raw.github.com/signalapp/maven/master/preferencefragment/releases/" - } - maven { - url "https://raw.github.com/signalapp/maven/master/smil/releases/" - } maven { url "https://raw.github.com/signalapp/maven/master/photoview/releases/" + content { + includeGroupByRegex "com\\.github\\.chrisbanes.*" + } } maven { url "https://raw.github.com/signalapp/maven/master/shortcutbadger/releases/" + content { + includeGroupByRegex "me\\.leolin.*" + } } maven { url "https://raw.github.com/signalapp/maven/master/circular-progress-button/releases/" + content { + includeGroupByRegex "com\\.github\\.dmytrodanylyk\\.circular-progress-button\\.*" + } } maven { url "https://raw.github.com/signalapp/maven/master/sqlcipher/release/" - } - maven { - url "https://maven.google.com" + content { + includeGroupByRegex "org\\.signal.*" + } } maven { // textdrawable url 'https://dl.bintray.com/amulyakhare/maven' + content { + includeGroupByRegex "com\\.amulyakhare.*" + } } maven { - url 'https://dl.bintray.com/google/flexbox-layout/' + url "https://maven.google.com" } google() jcenter() @@ -103,7 +106,7 @@ dependencies { compile 'com.squareup.dagger:dagger:1.2.2' annotationProcessor 'com.squareup.dagger:dagger-compiler:1.2.2' compile 'mobi.upod:time-duration-picker:1.1.3' - provided 'com.squareup.dagger:dagger-compiler:1.2.2' + compileOnly 'com.squareup.dagger:dagger-compiler:1.2.2' compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' compile 'com.google.zxing:core:3.2.1' compile ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') { @@ -132,22 +135,22 @@ dependencies { exclude group: 'org.freemarker' } - 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 'com.android.support:multidex:1.0.3' - androidTestCompile 'com.android.support:multidex-instrumentation:1.0.3' - androidTestCompile 'com.google.dexmaker:dexmaker:1.2' - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestCompile ('org.assertj:assertj-core:1.7.1') { + androidTestImplementation 'com.android.support:multidex:1.0.3' + androidTestImplementation 'com.android.support:multidex-instrumentation:1.0.3' + androidTestImplementation 'com.google.dexmaker:dexmaker:1.2' + androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2' + androidTestImplementation ('org.assertj:assertj-core:1.7.1') { exclude group: 'org.hamcrest', module: 'hamcrest-core' } - androidTestCompile ('com.squareup.assertj:assertj-android:1.1.1') { + androidTestImplementation ('com.squareup.assertj:assertj-android:1.1.1') { exclude group: 'org.hamcrest', module: 'hamcrest-core' exclude group: 'com.android.support', module: 'support-annotations' } @@ -215,7 +218,11 @@ dependencyVerification { 'com.android.support:support-fragment:3772fc738ada86824ba1a4b3f197c3dbd67b7ddcfe2c9db1de95ef2e3487a915', 'com.android.support:animated-vector-drawable:271ecbc906cda8dcd9e655ba0473129c3408a4189c806f616c378e6fd18fb3b7', 'com.android.support:support-core-ui:bbc7f65fc95649464733af373361532ab5f9f3b749c3badaa2bbf27e574b6c6f', + 'android.arch.persistence.room:runtime:c21810eaafce370f1c9df1365393f55f962370a0d8b0b38b4771052c7021b737', + 'com.android.support:support-core-utils:c81e1e98ca3cb2edae002c69cf35b22aec364b8cb2f1042c97e206eb5790ac41', + 'com.android.support:support-vector-drawable:f658986d968172bccfed28578471c96050780fe5e133861e4d331069cc373f4d', 'com.android.support:transition:45d09fc51284c17bbab300f5122512ac7d7348a6d23bda2051648bbe76cc9aa5', + 'com.android.support:loader:920b85efd72dc33e915b0f88a883fe73b88483c6df8751a741e17611f2460341', 'com.android.support:viewpager:013c4c53058758ec104dbae970be58159f75dfe342ba8b937d15ff5282e35ffc', 'com.android.support:coordinatorlayout:9dfacd80423dc979048fbaed83c0ee543c46259feb2417377e79a656888d3892', 'com.android.support:drawerlayout:8f6809afae4793550c37461c9810e954ae6a23dbb4d23e5333bf18148df1150a', @@ -223,30 +230,26 @@ dependencyVerification { 'com.android.support:customview:98db03845f994e08248bf701c1ff0ccaa12e70f94251ec9272900f0f694e072b', 'com.android.support:swiperefreshlayout:a3b41f7f6730866b49865e86e49f988d4858699765f534300fb2ff5f9325e712', 'com.android.support:asynclayoutinflater:115bde87721f7334579b0c735f60dd7c98af1bb7f34010c5b0553b95dc351aa2', - 'android.arch.persistence.room:runtime:c21810eaafce370f1c9df1365393f55f962370a0d8b0b38b4771052c7021b737', - 'com.android.support:support-core-utils:c81e1e98ca3cb2edae002c69cf35b22aec364b8cb2f1042c97e206eb5790ac41', - 'com.android.support:loader:920b85efd72dc33e915b0f88a883fe73b88483c6df8751a741e17611f2460341', - 'com.android.support:support-vector-drawable:f658986d968172bccfed28578471c96050780fe5e133861e4d331069cc373f4d', 'com.android.support:support-media-compat:266eff9605f515013eee1ebdbd8818a9270696dc807f34bbcc5fc11fb61a22c7', 'com.android.support:support-compat:e17e3b01dbea3f9ea1c86943292f903ca93d2231c6242e456e0b6a9c5817118a', 'com.android.support:versionedparcelable:60eb1cb08f71b65c3f6123135e03ebeb5930b5e126e1e5b2ac91b386908c9d02', 'com.android.support:collections:93c258c8a09f531a267653829742c0f8f6da0e348b11cb8655b0855628f2d4f0', + 'com.android.support:cursoradapter:87feffe742b8d62ca8a9833abe564838bf6a672e31c7ad1306ec4006adf90d21', + 'android.arch.lifecycle:runtime:c4e4be66c1b2f0abec593571454e1de14013f7e0f96bf2a9f212931a48cae550', 'android.arch.lifecycle:livedata:50ab0490c1ff1a7cfb4e554032998b080888946d0dd424f39900efc4a1bcd750', 'android.arch.lifecycle:livedata-core:d6fdd8b985d6178d7ea2f16986a24e83f1bee936b74d43167c69e08d3cc12c50', - 'android.arch.lifecycle:runtime:c4e4be66c1b2f0abec593571454e1de14013f7e0f96bf2a9f212931a48cae550', - 'android.arch.lifecycle:common:8d378e88ebd5189e09eef623414812c868fd90aa519d6160e2311fb8b81cff56', - 'com.github.bumptech.glide:gifdecoder:59ccf3bb0cec11dab4b857382cbe0b171111b6fc62bf141adce4e1180889af15', - 'com.android.support:interpolator:7bc7ee86a0db39a4b51956f3e89842d2bd962118d57d779eb6ed6b34ba0677ea', - 'com.android.support:cursoradapter:87feffe742b8d62ca8a9833abe564838bf6a672e31c7ad1306ec4006adf90d21', - 'android.arch.persistence.room:common:7cf36bcd5f59ddc4876f887e36511bfd7b111f1eb717c0e9b6e2bcc710305ae6', - 'android.arch.persistence:db-framework:bd665448330acb90a6f551a87b0ba69169da2b8ec168b92f387997339cc14311', - 'android.arch.persistence:db:504e8c4307bfd53084924776ba3d49fed11b6f76d82dd80d5121c2d907fdfef6', 'android.arch.core:runtime:c3215aa5873311b3f88a6f4e4a3c25ad89971bc127de8c3e1291c57f93a05c39', 'android.arch.core:common:3a616a32f433e9e23f556b38575c31b013613d3ae85206263b7625fe1f4c151a', + 'android.arch.lifecycle:common:8d378e88ebd5189e09eef623414812c868fd90aa519d6160e2311fb8b81cff56', 'android.arch.lifecycle:viewmodel:7de29cfaba77d6b5d5be234c57f6812d0150d087e63941af22ba1d1f8e2bc96a', + 'com.github.bumptech.glide:gifdecoder:59ccf3bb0cec11dab4b857382cbe0b171111b6fc62bf141adce4e1180889af15', 'com.android.support:documentfile:47cdcd3e9302b7b064923f05487a5c03babbd9bbda4726b71e97791fab5d4779', 'com.android.support:localbroadcastmanager:d287c823af5fdde72c099fcfc5f630efe9687af7a914343ae6fd92de32c8a806', 'com.android.support:print:4be8a812d73e4a80e35b91ceae127def3f0bb9726bf3bc439aa0cc81503f5728', + 'com.android.support:interpolator:7bc7ee86a0db39a4b51956f3e89842d2bd962118d57d779eb6ed6b34ba0677ea', + 'android.arch.persistence.room:common:7cf36bcd5f59ddc4876f887e36511bfd7b111f1eb717c0e9b6e2bcc710305ae6', + 'android.arch.persistence:db-framework:bd665448330acb90a6f551a87b0ba69169da2b8ec168b92f387997339cc14311', + 'android.arch.persistence:db:504e8c4307bfd53084924776ba3d49fed11b6f76d82dd80d5121c2d907fdfef6', 'com.android.support:support-annotations:5d5b9414f02d3fa0ee7526b8d5ddae0da67c8ecc8c4d63ffa6cf91488a93b927', 'com.google.guava:listenablefuture:e4ad7607e5c0477c6f890ef26a49cb8d1bb4dffb650bab4502afee64644e3069', 'org.signal:signal-metadata-android:d9d798aab7ee7200373ecff8718baf8aaeb632c123604e8a41b7b4c0c97eeee1', @@ -280,7 +283,7 @@ dependencyVerification { android { flavorDimensions "none" compileSdkVersion 28 - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.3' useLibrary 'org.apache.http.legacy' dexOptions { @@ -449,14 +452,18 @@ def signProductionRelease = { variant -> return outputFile } -task signProductionPlayRelease << { - signProductionRelease(android.applicationVariants.find({ it.name.equals("playRelease") })) +task signProductionPlayRelease { + doLast { + signProductionRelease(android.applicationVariants.find({ it.name.equals("playRelease") })) + } } -task signProductionWebsiteRelease << { - def variant = android.applicationVariants.find({ it.name.equals("websiteRelease") }) - File signedRelease = signProductionRelease(variant) - assembleWebsiteDescriptor(variant, signedRelease); +task signProductionWebsiteRelease { + doLast { + def variant = android.applicationVariants.find({ it.name.equals("websiteRelease") }) + File signedRelease = signProductionRelease(variant) + assembleWebsiteDescriptor(variant, signedRelease); + } } tasks.whenTaskAdded { task -> diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c148782666..096b12ad93 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip diff --git a/libs/gradle-witness.jar b/libs/gradle-witness.jar index 6ab83e596258e069a075bcee5d353177160aae2c..53abf2bb398b04bfaefed23dc52b864b5731b0d4 100644 GIT binary patch delta 3925 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

6aNxY@{N}_t| z65Xh5L#?Pl)X3tE(ic3m?9`_2TgmwkJrwpnM=P^*~fej)nO|sl9)gAQB)VrNbU#kopRpV#$Y5QsF^awtCl$xRRDj^Cw5Ajbk zN@dOIE?`KkLP?E_S9LTEe_de3@%GjcKfBLOXch26dUX>A(Ow*W(!fpE>n2{a5o2Sj zOAoiBH-!yi9WHCSC0|0XJV7G1M3g1J1`G0v6wC(%-2iGMSaWaKAgnwWjQn$2*S{Fr zQ%h?+B}x{_Cit8OrxOu>75Le37u`*gA5)KsG3cGlzj^*g{>0?X_LE7_Ij(WO2BkFR z8NMyow~I3x7?+k0>|{0}VOPi{vlEZ+)p*<+Owt#k+d`JCT;v2h?I+u$Y`YZ(nkr|$STURj(7lEl3j}&rxl|z*yW)g zqjCYeJ|OW1S@*sb8Cf;()^aWNRD>7QeZ|Jh_89(ly4aL-=(w=$b^CWfLQ!4+Pl#S2 z2K?Q&2cq}fO(NS?j@^5}H~M&y3RtP+jD&W{+jOOhr%lt9^%=~eA!fUM@!AoDonL^H zO96=TefuLJc|7_83Rk0Iv?)^NW~|<5w)0C0BJwBW4WV}^wfL-Kq*cVXpbVGgIF>S( zH3cmpnT}rFoo4Pb-5t6scBj)SRYHbo$wbPOwk78r;JjzK0CV1BTtD-B=TZsQ$YDL~ zQ7V71^s^jkzF-ITBaNSd&dhUAbL>%;tV~!yAbCzeg5flvg5s{kNnAOqM_!_Bo`G0F zpxfLaklp{*BQk(KiUX)efh%Q%I9Qpth&mXcOjqMbnbEy_NDufS)erk7pa6-oK5zrt zAB+dn{$M^5`!g8y!ys&5UJv$Bv9Vxa9Oz=lBp z;5o~C$o5-#_8S|H^N{WS8R#L99vVM*Za;7L_w$DO4LHmT7@V~{1nHMtERNhyygJvv zL19AsY`TEI{t;V|M^^gkepR@&Ulp4E#)gsD2ciKJ6!a+TkM#tZ3-1=m@9!$@M=ti? zSNnuIK;V@D0}1p0K6O1jRnpkEKM!=FxQ-q*^{f!XL*V&YIq`$XewPt9f!vSc;9d&9 WMbp2J5e9gWP(a)O%<6am0{stJyVTME delta 3882 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 -

- - - diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java index 21fac447e7..fdf3b76d9c 100644 --- a/src/org/thoughtcrime/securesms/ShareActivity.java +++ b/src/org/thoughtcrime/securesms/ShareActivity.java @@ -202,22 +202,6 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity } } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - super.onOptionsItemSelected(item); - switch (item.getItemId()) { - case R.id.menu_new_message: handleNewConversation(); return true; - case android.R.id.home: finish(); return true; - } - return false; - } - - private void handleNewConversation() { - Intent intent = getBaseShareIntent(NewConversationActivity.class); - isPassingAlongMedia = true; - startActivity(intent); - } - private void handleResolvedMedia(Intent intent, boolean animate) { long threadId = intent.getLongExtra(EXTRA_THREAD_ID, -1); int distributionType = intent.getIntExtra(EXTRA_DISTRIBUTION_TYPE, -1);