commit e8b8e0cdcfb98d6c36d470a2735fc2d8ab13bfb0
author Haibo Huang <hhb@google.com> Thu Mar 26 05:21:08 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 05:21:08 2020 +0000
tree 06d61c9d9bc56f8a3a93a7e39f63614f19b323a2
parent 0aae9c7cc7dd7ba1f1cfa53ab407a13d9aac816a
parent 9ede389bb7ce39f7b0edcb7b095b5f5344b22617

Merge "Fix the API for new flatbuffer" am: 9ede389bb7

Change-Id: I733fe4df4a67796465556e6d89b9c0b969798dfc

emoji-compat/build.gradle

diff --git a/emoji-compat/build.gradle b/emoji-compat/build.gradle
index 34acb79..752eb39 100644
--- a/emoji-compat/build.gradle
+++ b/emoji-compat/build.gradle
@@ -48,12 +48,12 @@
 }
 
 dependencies {
-    compile 'com.google.flatbuffers:flatbuffers-java:1.8.0'
+    compile 'com.google.flatbuffers:flatbuffers-java:1.12.0'
 }
 
 jarjar.repackage('rename') {
     destinationName "noto-emoji-compat-java.jar"
-    from 'com.google.flatbuffers:flatbuffers-java:1.8.0'
+    from 'com.google.flatbuffers:flatbuffers-java:1.12.0'
     from files(sourceSets.main.output.classesDirs)
     dependsOn sourceSets.main.output
     classRename 'com.google.flatbuffers.**', 'androidx.text.emoji.flatbuffer.@1'

emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataItem.java

diff --git a/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataItem.java b/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataItem.java
index 49a1e2b..eec1339 100644
--- a/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataItem.java
+++ b/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataItem.java
@@ -99,7 +99,7 @@
             short width,
             short height,
             int codepointsOffset) {
-        builder.startObject(7);
+        builder.startTable(7);
         MetadataItem.addCodepoints(builder, codepointsOffset);
         MetadataItem.addId(builder, id);
         MetadataItem.addHeight(builder, height);
@@ -111,7 +111,7 @@
     }
 
     public static void startMetadataItem(FlatBufferBuilder builder) {
-        builder.startObject(7);
+        builder.startTable(7);
     }
 
     public static void addId(FlatBufferBuilder builder, int id) {
@@ -153,7 +153,7 @@
     }
 
     public static int endMetadataItem(FlatBufferBuilder builder) {
-        int o = builder.endObject();
+        int o = builder.endTable();
         return o;
     }
 }

emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataList.java

diff --git a/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataList.java b/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataList.java
index 97b12a4..1851401 100644
--- a/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataList.java
+++ b/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataList.java
@@ -79,7 +79,7 @@
             int version,
             int listOffset,
             int sourceShaOffset) {
-        builder.startObject(3);
+        builder.startTable(3);
         MetadataList.addSourceSha(builder, sourceShaOffset);
         MetadataList.addList(builder, listOffset);
         MetadataList.addVersion(builder, version);
@@ -87,7 +87,7 @@
     }
 
     public static void startMetadataList(FlatBufferBuilder builder) {
-        builder.startObject(3);
+        builder.startTable(3);
     }
 
     public static void addVersion(FlatBufferBuilder builder, int version) {
@@ -113,7 +113,7 @@
     }
 
     public static int endMetadataList(FlatBufferBuilder builder) {
-        int o = builder.endObject();
+        int o = builder.endTable();
         return o;
     }