Unicode 17.0→ 18.0 (#1204)

* Copy emoji/dev to emoji/17.0.

* Copy idna/dev to idna/17.0.0.

* Copy security/dev to security/17.0.0.

* Copy uca/dev to uca/17.0.0.

* Copy ucd/dev to ucd/17.0.0.

* Copy ucdxml/dev to ucdxml/17.0.0.

* Bump version numbers in pub/meow.sh.

* Manually fix a dozen files

* Regenerate UCD

* Delimiter change

Author: eggrobin

.github/workflows/build-jsp.yml

@@ -1,8 +1,8 @@
 name: Build JSP
 
 env:
-  CURRENT_UVERSION: 17.0.0 # FIX_FOR_NEW_VERSION
-  PREVIOUS_UVERSION: 16.0.0  # not used at present
+  CURRENT_UVERSION: 18.0.0 # FIX_FOR_NEW_VERSION
+  PREVIOUS_UVERSION: 17.0.0  # not used at present
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 

.github/workflows/cli-build-instructions.yml

@@ -9,8 +9,8 @@ on:
     - '*'
 
 env:
-  CURRENT_UVERSION: 17.0.0  # FIX_FOR_NEW_VERSION
-  PREVIOUS_UVERSION: 16.0.0
+  CURRENT_UVERSION: 18.0.0  # FIX_FOR_NEW_VERSION
+  PREVIOUS_UVERSION: 17.0.0
 
 jobs:
 

UnicodeJsps/src/main/java/org/unicode/jsp/UBAVersion.java

@@ -19,7 +19,8 @@ public class UBAVersion {
                     Age_Values.V14_0,
                     Age_Values.V15_0,
                     Age_Values.V15_1,
-                    Age_Values.V16_0
+                    Age_Values.V16_0,
+                    Age_Values.V17_0
                     // FIX_FOR_NEW_VERSION
                     /* Current version is always last */
                     );

docs/pipeline.md

@@ -164,13 +164,13 @@ git merge main
 git checkout main unicodetools/data/ucd/dev/Derived*
 git checkout main unicodetools/data/ucd/dev/extracted/*
 git checkout main unicodetools/data/ucd/dev/auxiliary/*
-rm -r ../Generated/BIN/17.0.0.0/
-rm -r ../Generated/BIN/UCD_Data17.0.0.bin
-mvn -s ~/.m2/settings.xml compile exec:java -Dexec.mainClass="org.unicode.text.UCD.Main"  -Dexec.args="version 17.0.0 build MakeUnicodeFiles" -am -pl unicodetools  -DCLDR_DIR=$(cd ../../../cldr/mine/src ; pwd)  -DUNICODETOOLS_GEN_DIR=$(cd ../Generated ; pwd)  -DUNICODETOOLS_REPO_DIR=$(pwd)  -DUVERSION=17.0.0
+rm -r ../Generated/BIN/18.0.0.0/
+rm -r ../Generated/BIN/UCD_Data18.0.0.bin
+mvn -s ~/.m2/settings.xml compile exec:java -Dexec.mainClass="org.unicode.text.UCD.Main"  -Dexec.args="version 18.0.0 build MakeUnicodeFiles" -am -pl unicodetools  -DCLDR_DIR=$(cd ../../../cldr/mine/src ; pwd)  -DUNICODETOOLS_GEN_DIR=$(cd ../Generated ; pwd)  -DUNICODETOOLS_REPO_DIR=$(pwd)  -DUVERSION=18.0.0
 # fix merge conflicts in unicodetools/src/main/java/org/unicode/text/UCD/UCD_Types.java
 #   and in UCD_Names.java
 # rerun mvn
-cp -r ../Generated/UCD/17.0.0/* unicodetools/data/ucd/dev
+cp -r ../Generated/UCD/18.0.0/* unicodetools/data/ucd/dev
 rm unicodetools/data/ucd/dev/ZZZ-UNCHANGED-*
 rm unicodetools/data/ucd/dev/*/ZZZ-UNCHANGED-*
 rm unicodetools/data/ucd/dev/extra/*
@@ -195,7 +195,7 @@ eggrobin (Windows, in-source).
 ```powershell
 rm .\Generated\* -recurse -force
 mvn compile exec:java '-Dexec.mainClass="org.unicode.text.UCD.Main"'  '-Dexec.args="build MakeUnicodeFiles"' -am -pl unicodetools  "-DCLDR_DIR=..\cldr\"  "-DUNICODETOOLS_GEN_DIR=Generated"  "-DUNICODETOOLS_REPO_DIR=."
-cp .\Generated\UCD\17.0.0\* .\unicodetools\data\ucd\dev -recurse -force
+cp .\Generated\UCD\18.0.0\* .\unicodetools\data\ucd\dev -recurse -force
 rm unicodetools\data\ucd\dev\zzz-unchanged-*
 rm unicodetools\data\ucd\dev\*\zzz-unchanged-*
 rm .\unicodetools\data\ucd\dev\extra\*
@@ -211,7 +211,7 @@ eggrobin (Windows, in-source).
 ```powershell
 rm .\Generated\* -recurse -force
 mvn compile exec:java '-Dexec.mainClass="org.unicode.text.UCD.Main"'  '-Dexec.args="build MakeUnicodeFiles"' -am -pl unicodetools  "-DCLDR_DIR=..\cldr\"  "-DUNICODETOOLS_GEN_DIR=Generated"  "-DUNICODETOOLS_REPO_DIR=."
-cp .\Generated\UCD\17.0.0\LineBreak.txt .\unicodetools\data\ucd\dev
+cp .\Generated\UCD\18.0.0\LineBreak.txt .\unicodetools\data\ucd\dev
 ```
 
 ### GenerateEnums
@@ -229,6 +229,6 @@ git commit -m GenerateEnums
 
 eggrobin (Windows, in-source).
 ```powershell
-mvn test -am -pl unicodetools "-DCLDR_DIR=$(gl|split-path -parent)\cldr\"  "-DUNICODETOOLS_GEN_DIR=$(gl|split-path -parent)\unicodetools\Generated\"  "-DUNICODETOOLS_REPO_DIR=$(gl|split-path -parent)\unicodetools\" "-DUVERSION=17.0.0" "-Dtest=TestTestUnicodeInvariants#testAdditionComparisons" -DfailIfNoTests=false -DtrimStackTrace=false
+mvn test -am -pl unicodetools "-DCLDR_DIR=$(gl|split-path -parent)\cldr\"  "-DUNICODETOOLS_GEN_DIR=$(gl|split-path -parent)\unicodetools\Generated\"  "-DUNICODETOOLS_REPO_DIR=$(gl|split-path -parent)\unicodetools\" "-DUVERSION=18.0.0" "-Dtest=TestTestUnicodeInvariants#testAdditionComparisons" -DfailIfNoTests=false -DtrimStackTrace=false
 ```
 Results are in Generated\UnicodeTestResults-addition-comparisons-[RMG issue number].html.

pub/copy-alpha-to-draft.sh

@@ -12,8 +12,8 @@ UNITOOLS_DATA=$UNICODETOOLS/unicodetools/data
 
 # Adjust the following for each year and version as needed.
 COPY_YEAR=2025
-UNI_VER=17.0.0
-EMOJI_VER=17.0
+UNI_VER=18.0.0
+EMOJI_VER=18.0
 
 TODAY=`date --iso-8601`
 

pub/copy-beta-to-draft.sh

@@ -12,8 +12,8 @@ UNITOOLS_DATA=$UNICODETOOLS/unicodetools/data
 
 # Adjust the following for each year and version as needed.
 COPY_YEAR=2025
-UNI_VER=17.0.0
-EMOJI_VER=17.0
+UNI_VER=18.0.0
+EMOJI_VER=18.0
 
 TODAY=`date --iso-8601`
 

pub/copy-final.sh

@@ -12,8 +12,8 @@ UNITOOLS_DATA=$UNICODETOOLS/unicodetools/data
 
 # Adjust the following for each year and version as needed.
 COPY_YEAR=2025
-UNI_VER=17.0.0
-EMOJI_VER=17.0
+UNI_VER=18.0.0
+EMOJI_VER=18.0
 
 TODAY=`date --iso-8601`
 

pub/copy-ucd-to-draft.sh

@@ -12,8 +12,8 @@ UNITOOLS_DATA=$UNICODETOOLS/unicodetools/data
 
 # Adjust the following for each year and version as needed.
 COPY_YEAR=2025
-UNI_VER=17.0.0
-EMOJI_VER=17.0
+UNI_VER=18.0.0
+EMOJI_VER=18.0
 
 TODAY=`date --iso-8601`
 

unicodetools/data/emoji/17.0/ReadMe.txt

@@ -0,0 +1,21 @@
+# Unicode Emoji
+# © COPY_YEAR Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use and license, see https://www.unicode.org/terms_of_use.html
+
+This directory contains PUB_STATUS data files for Unicode Emoji, Version EMOJI_VER
+
+PUBLIC_EMOJI/
+
+  emoji-sequences.txt
+  emoji-zwj-sequences.txt
+  emoji-test.txt
+
+The following related files are found in the UCD for Version EMOJI_VER
+
+PUBLIC_UCD/ucd/emoji/
+
+  emoji-data.txt
+  emoji-variation-sequences.txt
+
+For documentation, see UTS #51 Unicode Emoji, Version EMOJI_VER