feat(EmojiManager.java): added more emojis to list

YotpoLtd · Dec 28, 2021 · d1b154c · d1b154c
1 parent 9a90624
commit d1b154c
Show file tree

Hide file tree

Showing 5 changed files with 2,629 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,7 @@
 sudo: false
 language: java
-dist: precise
+dist: xenial
 jdk:
-  - openjdk6
-  - oraclejdk7
-  - openjdk7
-  - oraclejdk8
+  - openjdk11
 after_success:
   - mvn clean cobertura:cobertura coveralls:cobertura
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.vdurmont</groupId>
     <artifactId>emoji-java</artifactId>
-    <version>5.1.1</version>
+    <version>5.1.2</version>
     <packaging>jar</packaging>
 
     <name>emoji-java</name>
@@ -35,19 +35,21 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20170516</version>
+            <version>20211205</version>
         </dependency>
 
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -58,7 +60,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>cobertura-maven-plugin</artifactId>
-                    <version>2.5.2</version>
+                    <version>2.7</version>
                     <configuration>
                         <format>xml</format>
                         <maxmem>256m</maxmem>

diff --git a/src/main/java/com/vdurmont/emoji/EmojiManager.java b/src/main/java/com/vdurmont/emoji/EmojiManager.java
@@ -10,6 +10,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Holds the loaded emojis and provides search functions.
@@ -18,6 +20,8 @@
  */
 public class EmojiManager {
   private static final String PATH = "/emojis.json";
+  private static final String RUMOJI_PATH = "/rumojiExtendedEmojis.json";
+
   private static final Map<String, Emoji> EMOJIS_BY_ALIAS =
     new HashMap<String, Emoji>();
   private static final Map<String, Set<Emoji>> EMOJIS_BY_TAG =
@@ -29,7 +33,11 @@ public class EmojiManager {
     try {
       InputStream stream = EmojiLoader.class.getResourceAsStream(PATH);
       List<Emoji> emojis = EmojiLoader.loadEmojis(stream);
+      InputStream rumojiStream = EmojiLoader.class.getResourceAsStream(RUMOJI_PATH);
+      List<Emoji> rumojiEmojis = EmojiLoader.loadEmojis(rumojiStream);
+
       ALL_EMOJIS = emojis;
+      ALL_EMOJIS.addAll(rumojiEmojis);
       for (Emoji emoji : emojis) {
         for (String tag : emoji.getTags()) {
           if (EMOJIS_BY_TAG.get(tag) == null) {