From 5c44c2f7ae682b19dc7b5c1a0b3df45297461b93 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 14 Aug 2024 13:11:28 +0200 Subject: [PATCH] update dependencies --- build.gradle | 30 +++++++++---------- .../securesms/NewConversationActivity.java | 12 -------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index 8c604341c5..54c80214c5 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ android { applicationId "com.b44t.messenger" multiDexEnabled true - minSdkVersion 19 + minSdkVersion 21 targetSdkVersion 33 vectorDrawables.useSupportLibrary = true @@ -144,24 +144,24 @@ android { dependencies { implementation 'androidx.sharetarget:sharetarget:1.2.0' - implementation 'androidx.webkit:webkit:1.8.0' + implementation 'androidx.webkit:webkit:1.11.0' implementation 'androidx.multidex:multidex:2.0.1' - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.10.0' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.legacy:legacy-support-v13:1.0.0' implementation ('androidx.preference:preference:1.2.1') { exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel' exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel-ktx' } implementation 'androidx.legacy:legacy-preference-v14:1.0.0' - implementation 'androidx.exifinterface:exifinterface:1.3.6' + implementation 'androidx.exifinterface:exifinterface:1.3.7' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2' implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2' - implementation 'androidx.work:work-runtime:2.8.1' + implementation 'androidx.work:work-runtime:2.9.1' implementation 'androidx.emoji2:emoji2-emojipicker:1.4.0' - implementation 'com.google.guava:guava:29.0-android' + implementation 'com.google.guava:guava:31.1-android' implementation 'com.google.android.exoplayer:exoplayer-core:2.19.1' // plays video and audio implementation 'com.google.android.exoplayer:exoplayer-ui:2.19.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' @@ -176,7 +176,7 @@ dependencies { implementation 'com.caverock:androidsvg-aar:1.4' // SVG support. implementation 'com.github.bumptech.glide:glide:4.12.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' - annotationProcessor 'androidx.annotation:annotation:1.7.0' + annotationProcessor 'androidx.annotation:annotation:1.8.2' 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:1.0.1@aar' // used for profile and group avatar selection in Android SDK<19 @@ -195,13 +195,13 @@ dependencies { // implementation 'de.cketti.safecontentresolver:safe-content-resolver-v14:1.0.0' - gplayImplementation('com.google.firebase:firebase-messaging:23.4.1') { // for PUSH notifications + gplayImplementation('com.google.firebase:firebase-messaging:24.0.0') { // for PUSH notifications exclude group: 'com.google.firebase', module: 'firebase-core' exclude group: 'com.google.firebase', module: 'firebase-analytics' exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' } - testImplementation 'junit:junit:4.13.1' + testImplementation 'junit:junit:4.13.2' 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' @@ -209,11 +209,11 @@ dependencies { testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1' testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1' - androidTestImplementation 'androidx.test:runner:1.4.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0' - androidTestImplementation 'androidx.test:rules:1.4.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test:runner:1.6.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' + androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.6.1' + androidTestImplementation 'androidx.test:rules:1.6.1' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' androidTestImplementation 'com.android.support:support-annotations:28.0.0' androidTestImplementation ('org.assertj:assertj-core:1.7.1') { diff --git a/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java index cd3a507ebe..8a624ae3df 100644 --- a/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java @@ -155,16 +155,4 @@ private void openConversation(int chatId) { startActivity(intent); finish(); } - - @Override - protected boolean onPrepareOptionsPanel(View view, Menu menu) { - /* currently not needed - MenuInflater inflater = this.getMenuInflater(); - menu.clear(); - inflater.inflate(R.menu.new_conversation_activity, menu); - */ - super.onPrepareOptionsMenu(menu); - return true; - } - }