summaryrefslogtreecommitdiffhomepage
path: root/android/app
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-08-04 17:05:28 +0200
committerAlbin <albin@mullvad.net>2023-08-04 17:05:28 +0200
commit2f6f85c086a5eb94cb3a6e172830a34fe25cbef8 (patch)
tree4d98c9ae2af5c370a6f82230ef44e35f289bcba2 /android/app
parentc02098a983aa33e70f56f9153022d3916f71283c (diff)
parent0677c9d1a2b2200c320e69ac83ebb72a2b627b07 (diff)
downloadmullvadvpn-2f6f85c086a5eb94cb3a6e172830a34fe25cbef8.tar.xz
mullvadvpn-2f6f85c086a5eb94cb3a6e172830a34fe25cbef8.zip
Merge branch 'fix-lazy-list-scroll-crash-droid-237'
Diffstat (limited to 'android/app')
-rw-r--r--android/app/build.gradle.kts7
1 files changed, 7 insertions, 0 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index f257d862d7..d67a07a191 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -213,6 +213,13 @@ play {
serviceAccountCredentials.set(file("play-api-key.json"))
}
+configurations.all {
+ resolutionStrategy {
+ // Hold back emoji2 since newer versions require api level 34 which is not yet stable.
+ force("androidx.emoji2:emoji2:1.3.0")
+ }
+}
+
dependencies {
implementation(project(Dependencies.Mullvad.vpnService))
implementation(project(Dependencies.Mullvad.tileService))