From add068ab773a1024582f994ba430d8887cfe2dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 4 Jul 2024 22:41:22 +0100
Subject: [PATCH] Update gson to 2.11.0, simplify android-emojify

---
 app/build.gradle       | 6 ++++--
 app/proguard-rules.pro | 5 -----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 37ed6614c..b5341073e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -224,7 +224,7 @@ dependencies {
 
     implementation "com.google.android.material:material:1.9.0"
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
-    implementation "com.google.code.gson:gson:2.8.9"
+    implementation "com.google.code.gson:gson:2.11.0"
 
     implementation "no.nordicsemi.android:dfu:1.12.0"
     implementation "com.github.tony19:logback-android:3.0.0"
@@ -240,7 +240,9 @@ dependencies {
     implementation "org.apache.commons:commons-lang3:3.7"
     implementation "org.cyanogenmod:platform.sdk:6.0"
     implementation 'com.jaredrummler:colorpicker:1.1.0'
-    implementation 'com.github.wax911:android-emojify:1.9.2'
+    implementation 'com.github.wax911.android-emojify:contract:1.9.2'
+    implementation 'com.github.wax911.android-emojify:emojify:1.9.2'
+    implementation 'com.github.wax911.android-emojify:gson:1.9.2'
     implementation 'com.google.protobuf:protobuf-javalite:4.27.2'
     implementation 'com.android.volley:volley:1.2.1'
 
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index c3c9f2208..2b33bfa43 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -64,11 +64,6 @@
 # Keep Nordic DFU library
 -keep class no.nordicsemi.android.dfu.** { *; }
 
-# For android-emojify - we are not using moshi, so ignore these
--dontwarn com.squareup.moshi.**
--dontwarn kotlinx.serialization.**
--dontwarn okio.**
-
 # Keep logback classes
 -keep class ch.qos.** { *; }
 -keep class org.slf4j.** { *; }