1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-09-01 03:55:47 +02:00

Update gson to 2.11.0, simplify android-emojify

This commit is contained in:
José Rebelo 2024-07-04 22:41:22 +01:00
parent cb7acb0cec
commit add068ab77
2 changed files with 4 additions and 7 deletions

View File

@ -224,7 +224,7 @@ dependencies {
implementation "com.google.android.material:material:1.9.0" implementation "com.google.android.material:material:1.9.0"
implementation 'com.google.android.flexbox:flexbox:3.0.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 "no.nordicsemi.android:dfu:1.12.0"
implementation "com.github.tony19:logback-android:3.0.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.apache.commons:commons-lang3:3.7"
implementation "org.cyanogenmod:platform.sdk:6.0" implementation "org.cyanogenmod:platform.sdk:6.0"
implementation 'com.jaredrummler:colorpicker:1.1.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.google.protobuf:protobuf-javalite:4.27.2'
implementation 'com.android.volley:volley:1.2.1' implementation 'com.android.volley:volley:1.2.1'

View File

@ -64,11 +64,6 @@
# Keep Nordic DFU library # Keep Nordic DFU library
-keep class no.nordicsemi.android.dfu.** { *; } -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 logback classes
-keep class ch.qos.** { *; } -keep class ch.qos.** { *; }
-keep class org.slf4j.** { *; } -keep class org.slf4j.** { *; }