bump appcompat, migrate to emoji2 and get rid of emoji flavor

1 files changed, 19 insertions, 61 deletions

diff --git a/build.gradle b/build.gradle
index 6f26dc4fc..210fd1f61 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,13 +20,13 @@ repositories {
 
 configurations {
     playstoreImplementation
-    compatImplementation
-    conversationsFreeCompatImplementation
-    conversationsPlaystoreCompatImplementation
-    conversationsPlaystoreSystemImplementation
-    quicksyPlaystoreCompatImplementation
-    quicksyPlaystoreSystemImplementation
-    quicksyFreeCompatImplementation
+    freeImplementation
+    conversationsFreeImplementation
+    conversationsPlaystorImplementation
+    conversationsPlaystoreImplementation
+    quicksyPlaystoreImplementation
+    quicksyPlaystoreImplementation
+    quicksyFreeImplementation
     quicksyImplementation
 }
 
@@ -38,21 +38,19 @@ dependencies {
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
     }
-    conversationsPlaystoreCompatImplementation("com.android.installreferrer:installreferrer:2.2")
-    conversationsPlaystoreSystemImplementation("com.android.installreferrer:installreferrer:2.2")
-    quicksyPlaystoreCompatImplementation 'com.google.android.gms:play-services-auth-api-phone:18.0.1'
-    quicksyPlaystoreSystemImplementation 'com.google.android.gms:play-services-auth-api-phone:18.0.1'
+    conversationsPlaystoreImplementation("com.android.installreferrer:installreferrer:2.2")
+    quicksyPlaystoreImplementation 'com.google.android.gms:play-services-auth-api-phone:18.0.1'
     implementation 'org.sufficientlysecure:openpgp-api:10.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'androidx.emoji:emoji:1.1.0'
     implementation 'com.google.android.material:material:1.4.0'
-    compatImplementation 'androidx.emoji:emoji-appcompat:1.1.0'
-    conversationsFreeCompatImplementation 'androidx.emoji:emoji-bundled:1.1.0'
-    quicksyFreeCompatImplementation 'androidx.emoji:emoji-bundled:1.1.0'
+
+    implementation "androidx.emoji2:emoji2:1.1.0-rc01"
+    freeImplementation "androidx.emoji2:emoji2-bundled:1.1.0-rc01"
+
     implementation 'org.bouncycastle:bcmail-jdk15on:1.64'
     //zxing stopped supporting Java 7 so we have to stick with 3.3.3
     //https://github.com/zxing/zxing/issues/1170
@@ -122,7 +120,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    flavorDimensions("mode", "distribution", "emoji")
+    flavorDimensions("mode", "distribution")
 
     productFlavors {
 
@@ -148,39 +146,15 @@ android {
             dimension "distribution"
             versionNameSuffix "+f"
         }
-        system {
-            dimension "emoji"
-            versionNameSuffix "s"
-        }
-        compat {
-            dimension "emoji"
-            versionNameSuffix "c"
-        }
     }
 
     sourceSets {
-        quicksyFreeSystem {
+        quicksyFree {
             java {
                 srcDir 'src/quicksyFree/java'
             }
         }
-        quicksyFreeCompat {
-            java {
-                srcDir 'src/freeCompat/java'
-                srcDir 'src/quicksyFree/java'
-            }
-        }
-        quicksyPlaystoreCompat {
-            java {
-                srcDir 'src/playstoreCompat/java'
-                srcDir 'src/quicksyPlaystore/java'
-            }
-            res {
-                srcDir 'src/playstoreCompat/res'
-                srcDir 'src/quicksyPlaystore/res'
-            }
-        }
-        quicksyPlaystoreSystem {
+        quicksyPlaystore {
             java {
                 srcDir 'src/quicksyPlaystore/java'
             }
@@ -188,28 +162,12 @@ android {
                 srcDir 'src/quicksyPlaystore/res'
             }
         }
-        conversationsFreeCompat {
+        conversationsFree {
             java {
-                srcDir 'src/freeCompat/java'
                 srcDir 'src/conversationsFree/java'
             }
         }
-        conversationsFreeSystem {
-            java {
-                srcDir 'src/conversationsFree/java'
-            }
-        }
-        conversationsPlaystoreCompat {
-            java {
-                srcDir 'src/playstoreCompat/java'
-                srcDir 'src/conversationsPlaystore/java'
-            }
-            res {
-                srcDir 'src/playstoreCompat/res'
-                srcDir 'src/conversationsPlaystore/res'
-            }
-        }
-        conversationsPlaystoreSystem {
+        conversationsPlaystore {
             java {
                 srcDir 'src/conversationsPlaystore/java'
             }