Merge "Snap for 6922857 from de06abce44693daffd1b49b34aaff186932f98c4 to androidx-master-release" into androidx-master-release
diff --git a/emoji-compat/build.gradle b/emoji-compat/build.gradle
index 752eb39..3e6b0b9 100644
--- a/emoji-compat/build.gradle
+++ b/emoji-compat/build.gradle
@@ -14,28 +14,20 @@
  * limitations under the License.
  */
 
-apply plugin: 'java'
-apply plugin: 'org.anarres.jarjar'
-apply plugin: 'maven'
-
-ext {
-    flatbuffersDir = '../../flatbuffers'
-}
-
 buildscript {
-    boolean unbundleBuild = (new File("unbundled-build")).exists()
     repositories {
         maven { url '../../../prebuilts/androidx/external' }
-        if (unbundleBuild) {
-            jcenter()
-        }
     }
-
     dependencies {
         classpath 'org.anarres.jarjar:jarjar-gradle:1.0.1'
     }
 }
 
+plugins {
+    id("java")
+    id("org.anarres.jarjar")
+}
+
 sourceSets {
     main {
         java.srcDirs = ['src/java']
@@ -48,7 +40,7 @@
 }
 
 dependencies {
-    compile 'com.google.flatbuffers:flatbuffers-java:1.12.0'
+    implementation("com.google.flatbuffers:flatbuffers-java:1.12.0")
 }
 
 jarjar.repackage('rename') {