Emoji 17.0 charts (#1198)

* Emoji 17.0 charts

* Update to snapshot with fix for CLDR-18591

* Attempt a fix for removed com.ibm.icu.dev.test.TestFmwk

* Why was this stuck at Unicode 12?

* drop it

* Bump CLDR snapshot version

---------

Co-authored-by: Robin Leroy <[email protected]>

Author: nedley

UnicodeJsps/src/test/java/org/unicode/jsptest/TestAll.java

@@ -2,7 +2,7 @@
 
 package org.unicode.jsptest;
 
-import com.ibm.icu.dev.test.TestFmwk.TestGroup;
+import org.unicode.cldr.icu.dev.test.TestFmwk.TestGroup;
 
 /** Top level test used to run all other tests as a batch. */
 public class TestAll extends TestGroup {

UnicodeJsps/src/test/java/org/unicode/jsptest/TestGenerate.java

@@ -1,6 +1,5 @@
 package org.unicode.jsptest;
 
-import com.ibm.icu.dev.test.TestFmwk;
 import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
@@ -15,6 +14,7 @@
 import java.io.IOException;
 import java.util.Comparator;
 import java.util.TreeSet;
+import org.unicode.cldr.icu.dev.test.TestFmwk;
 import org.unicode.cldr.util.props.BagFormatter;
 import org.unicode.cldr.util.props.UnicodeLabel;
 import org.unicode.idna.Idna;

UnicodeJsps/src/test/java/org/unicode/jsptest/TestTypology.java

@@ -1,6 +1,5 @@
 package org.unicode.jsptest;
 
-import com.ibm.icu.dev.test.TestFmwk;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
 import com.ibm.icu.impl.Row.R3;
@@ -23,6 +22,7 @@
 import java.util.TreeSet;
 import java.util.regex.Pattern;
 import org.unicode.cldr.draft.FileUtilities;
+import org.unicode.cldr.icu.dev.test.TestFmwk;
 import org.unicode.cldr.util.MultiComparator;
 import org.unicode.cldr.util.UnicodeSetPrettyPrinter;
 import org.unicode.jsp.Typology;

pom.xml

@@ -31,7 +31,7 @@
         <!--
              For CLDR versions, see https://github.com/orgs/unicode-org/packages?repo_name=cldr
           -->
-        <cldr.version>0.0.0-SNAPSHOT-e1d37acce5</cldr.version>
+        <cldr.version>0.0.0-SNAPSHOT-649eb5da8e</cldr.version>
 
 
         <!-- these two set the JDK version for source and target -->

unicodetools/data/emoji/dev/internal/emoji-ordering-rules.txt

@@ -1,4 +1,4 @@
-<!-- Machine-readable version of the emoji ordering rules for v17.0β (corresponding to CLDR). -->
+<!-- Machine-readable version of the emoji ordering rules for v17.0 (corresponding to CLDR). -->
 <collation type='emoji'>
 <cr><![CDATA[
 # START AUTOGENERATED EMOJI ORDER

unicodetools/src/main/java/org/unicode/tools/emoji/EmojiAnnotations.java

@@ -20,6 +20,8 @@
 import org.unicode.cldr.util.Annotations.AnnotationSet;
 import org.unicode.cldr.util.CLDRFile;
 import org.unicode.cldr.util.CldrUtility;
+import org.unicode.cldr.util.NameGetter;
+import org.unicode.cldr.util.NameType;
 import org.unicode.text.utility.Birelation;
 
 public class EmojiAnnotations extends Birelation<String, String> {
@@ -365,7 +367,9 @@ private Status getNameAndAnnotations(
                 return Status.found;
             } else if (Emoji.REGIONAL_INDICATORS.containsAll(s)) {
                 String countryCode = Emoji.getFlagCode(s);
-                outShortName.value = cldrFile.getName(CLDRFile.TERRITORY_NAME, countryCode);
+                NameGetter nameGetter = cldrFile.nameGetter();
+                outShortName.value =
+                        nameGetter.getNameFromTypeEnumCode(NameType.TERRITORY, countryCode);
                 keywordsToAppendTo.addAll(Collections.singleton("flag"));
                 return outShortName.value == null ? Status.missing : Status.found;
             } else if (s.contains(Emoji.KEYCAP_MARK_STRING)) {

unicodetools/src/main/java/org/unicode/tools/emoji/ProposalData.java

@@ -102,19 +102,8 @@ public Set<String> getProposals(String source) {
                             CandidateData.getInstance().getProposal(source),
                             Collections.emptySet()));
         }
-        if (output.isEmpty()) {
-            // hack skin color
-            if (source.contains(SKIN_REPRESENTATIVE)) {
-                source = source.replaceAll(SKIN_REPRESENTATIVE, "");
-                Set<String> other = getProposals(source);
-                if (!other.isEmpty()) {
-                    output.addAll(other);
-                    output.add("L2/14‑173");
-                }
-            }
-            if (output.isEmpty()) { // for debugging
-                Set<String> foo = CandidateData.getInstance().getProposal(source);
-            }
+        if (output.isEmpty()) { // for debugging
+            Set<String> foo = CandidateData.getInstance().getProposal(source);
         }
         return output;
     }
@@ -171,8 +160,8 @@ public String formatProposalsForHtml(Collection<String> proposals) {
 
     static UnicodeMap<Set<String>> load(StringBuffer header) {
         UnicodeMap<Set<String>> builder = new UnicodeMap<>();
-        Set<String> skinProposals = ImmutableSet.<String>builder().add("L2/14-173").build();
-        Set<String> genProposals = ImmutableSet.<String>builder().add("L2/16-160").build();
+        Set<String> skinProposals = ImmutableSet.<String>builder().build();
+        Set<String> genProposals = ImmutableSet.<String>builder().build();
 
         boolean haveData = false;
         for (String line : FileUtilities.in(ProposalData.class, "proposalData.txt")) {