Skip to content

Commit e0f46ea

Browse files
committedNov 5, 2023
update dependencies
1 parent e0af047 commit e0f46ea

File tree

3 files changed

+38
-22
lines changed

3 files changed

+38
-22
lines changed
 

‎build.gradle

+23-21
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'com.android.application' version '7.4.2'
2+
id 'com.android.application' version '8.1.2'
33
}
44

55
repositories {
@@ -20,22 +20,22 @@ dependencies {
2020
implementation "io.noties.markwon:ext-strikethrough:$markwon_version"
2121
implementation "io.noties.markwon:ext-tasklist:$markwon_version"
2222
implementation 'androidx.sharetarget:sharetarget:1.2.0'
23-
implementation 'androidx.webkit:webkit:1.5.0'
23+
implementation 'androidx.webkit:webkit:1.8.0'
2424
implementation 'androidx.multidex:multidex:2.0.1'
25-
implementation 'androidx.appcompat:appcompat:1.5.1'
26-
implementation 'com.google.android.material:material:1.7.0'
25+
implementation 'androidx.appcompat:appcompat:1.6.1'
26+
implementation 'com.google.android.material:material:1.10.0'
2727
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
28-
implementation ('androidx.preference:preference:1.2.0') {
28+
implementation ('androidx.preference:preference:1.2.1') {
2929
exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel'
3030
exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel-ktx'
3131
}
3232
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
33-
implementation 'androidx.exifinterface:exifinterface:1.3.5'
33+
implementation 'androidx.exifinterface:exifinterface:1.3.6'
3434
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
35-
implementation 'androidx.lifecycle:lifecycle-common-java8:2.5.1'
36-
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
37-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
38-
implementation 'androidx.work:work-runtime:2.7.1'
35+
implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
36+
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2'
37+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
38+
implementation 'androidx.work:work-runtime:2.8.1'
3939
implementation 'com.google.android.exoplayer:exoplayer-core:2.9.6' // plays video and audio
4040
implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.6'
4141
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
@@ -50,7 +50,7 @@ dependencies {
5050
implementation 'com.caverock:androidsvg-aar:1.4' // SVG support.
5151
implementation 'com.github.bumptech.glide:glide:4.12.0'
5252
annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
53-
annotationProcessor 'androidx.annotation:annotation:1.5.0'
53+
annotationProcessor 'androidx.annotation:annotation:1.7.0'
5454
implementation 'com.makeramen:roundedimageview:2.1.0' // crops the avatars to circles
5555
implementation 'com.pnikosis:materialish-progress:1.5' // used only in the "Progress Wheel" in Share Activity.
5656
implementation 'com.soundcloud.android:android-crop:1.0.1@aar' // used for profile and group avatar selection in Android SDK<19
@@ -92,7 +92,7 @@ dependencies {
9292
android {
9393
namespace "org.thoughtcrime.securesms"
9494
flavorDimensions "none"
95-
compileSdkVersion 33
95+
compileSdk 34
9696

9797
// Set NDK version to strip native libraries.
9898
// Even though we compile our libraries outside Gradle with `scripts/ndk-make.sh`,
@@ -132,18 +132,16 @@ android {
132132
sourceCompatibility JavaVersion.VERSION_1_8
133133
targetCompatibility JavaVersion.VERSION_1_8
134134
}
135-
136135
packagingOptions {
137-
exclude 'LICENSE.txt'
138-
exclude 'LICENSE'
139-
exclude 'NOTICE'
140-
exclude 'asm-license.txt'
141-
exclude 'META-INF/LICENSE'
142-
exclude 'META-INF/NOTICE'
143-
doNotStrip '*/mips/*.so'
144-
doNotStrip '*/mips64/*.so'
136+
jniLibs {
137+
keepDebugSymbols += ['*/mips/*.so', '*/mips64/*.so']
138+
}
139+
resources {
140+
excludes += ['LICENSE.txt', 'LICENSE', 'NOTICE', 'asm-license.txt', 'META-INF/LICENSE', 'META-INF/NOTICE']
141+
}
145142
}
146143

144+
147145
signingConfigs {
148146
release {
149147
// can be defined at `~/.gradle/gradle.properties` or at "Build/Generate signed APK"
@@ -227,6 +225,10 @@ android {
227225
lint {
228226
abortOnError false
229227
}
228+
buildFeatures {
229+
renderScript true
230+
aidl true
231+
}
230232

231233
}
232234

‎gradle.properties

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
android.defaults.buildfeatures.buildconfig=true
12
android.enableJetifier=true
3+
android.nonFinalResIds=false
4+
android.nonTransitiveRClass=false
25
android.useAndroidX=true
3-
org.gradle.jvmargs=-Xmx4608m
6+
org.gradle.jvmargs=-Xmx4608m

‎proguard-rules.pro

+11
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,14 @@
77

88
# unused SealedData constructor needed by JsonUtils
99
-keep class org.thoughtcrime.securesms.crypto.KeyStoreHelper* { *; }
10+
11+
# Please add these rules to your existing keep rules in order to suppress warnings.
12+
# This is generated automatically by the Android Gradle plugin.
13+
-dontwarn com.google.android.gms.common.GoogleApiAvailability
14+
-dontwarn com.google.android.gms.location.FusedLocationProviderClient
15+
-dontwarn com.google.android.gms.location.LocationCallback
16+
-dontwarn com.google.android.gms.location.LocationRequest
17+
-dontwarn com.google.android.gms.location.LocationServices
18+
-dontwarn com.google.android.gms.tasks.OnFailureListener
19+
-dontwarn com.google.android.gms.tasks.OnSuccessListener
20+
-dontwarn com.google.android.gms.tasks.Task

0 commit comments

Comments
 (0)