Unicode 16.0 version numbers

unicode-org · Sep 19, 2023 · bc9d936 · bc9d936
1 parent 66565c0
commit bc9d936
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 18 deletions.
diff --git a/.github/workflows/build-jsp.yml b/.github/workflows/build-jsp.yml
@@ -1,8 +1,8 @@
 name: Build JSP
 
 env:
-  CURRENT_UVERSION: 15.1.0
-  PREVIOUS_UVERSION: 15.0.0  # not used at present
+  CURRENT_UVERSION: 16.0.0
+  PREVIOUS_UVERSION: 15.1.0  # not used at present
 
 on:
   push:

diff --git a/.github/workflows/cli-build-instructions.yml b/.github/workflows/cli-build-instructions.yml
@@ -9,8 +9,8 @@ on:
     - '*'
 
 env:
-  CURRENT_UVERSION: 15.1.0
-  PREVIOUS_UVERSION: 15.0.0
+  CURRENT_UVERSION: 16.0.0
+  PREVIOUS_UVERSION: 15.1.0
 
 jobs:
 

diff --git a/docs/data-workflow.md b/docs/data-workflow.md
@@ -170,4 +170,6 @@ Edit the pub/*.sh scripts and advance the version numbers.
 Change the Unicode Tools code as necessary for the start of work on the next version.
 Settings.java lastVersion & latestVersion and more.
 
+Example, Unicode 15.1→16.0: https://github.com/unicode-org/unicodetools/pull/539
+
 Declare “main” to be open for the next version.
diff --git a/pub/copy-alpha-to-draft.sh b/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=2023
-UNI_VER=15.1.0
-EMOJI_VER=15.1
+UNI_VER=16.0.0
+EMOJI_VER=16.0
 
 TODAY=`date --iso-8601`
 

diff --git a/pub/copy-beta-to-draft.sh b/pub/copy-beta-to-draft.sh
@@ -12,11 +12,11 @@ UNITOOLS_DATA=$UNICODETOOLS/unicodetools/data
 
 # Adjust the following for each year and version as needed.
 COPY_YEAR=2023
-UNI_VER=15.1.0
-EMOJI_VER=15.1
+UNI_VER=16.0.0
+EMOJI_VER=16.0
 # UTS #10 release revision number to be used in CollationTest.html:
 # One more than the last release revision number.
-TR10_REV=tr10-48
+TR10_REV=tr10-50
 
 TODAY=`date --iso-8601`
 

diff --git a/pub/copy-final.sh b/pub/copy-final.sh
@@ -12,11 +12,11 @@ UNITOOLS_DATA=$UNICODETOOLS/unicodetools/data
 
 # Adjust the following for each year and version as needed.
 COPY_YEAR=2023
-UNI_VER=15.1.0
-EMOJI_VER=15.1
+UNI_VER=16.0.0
+EMOJI_VER=16.0
 # UTS #10 release revision number to be used in CollationTest.html:
 # *Two* more than the last release revision number.
-TR10_REV=tr10-49
+TR10_REV=tr10-51
 
 TODAY=`date --iso-8601`
 

diff --git a/unicodetools/data/ucd/dev/PropertyValueAliases.txt b/unicodetools/data/ucd/dev/PropertyValueAliases.txt
@@ -92,6 +92,7 @@ age; 13.0                             ; V13_0
 age; 14.0                             ; V14_0
 age; 15.0                             ; V15_0
 age; 15.1                             ; V15_1
+age; 16.0                             ; V16_0
 age; NA                               ; Unassigned
 
 # Alphabetic (Alpha)

diff --git a/unicodetools/src/main/java/org/unicode/idna/GenerateIdnaTest.java b/unicodetools/src/main/java/org/unicode/idna/GenerateIdnaTest.java
@@ -177,7 +177,7 @@ int generateTests(int lines) throws IOException {
             // See https://github.com/unicode-org/unicodetools/issues/100 "Whither 13.1.0?"
             lastVersion = "13.0.0";
         }
-        int ucdTypesLastVersion = UCD_Types.AGE150;
+        int ucdTypesLastVersion = UCD_Types.AGE151;
         String ucdTypesLastVersionString = UCD_Types.AGE_VERSIONS[ucdTypesLastVersion];
         if (!ucdTypesLastVersionString.equals(lastVersion)) {
             throw new AssertionError(

diff --git a/unicodetools/src/main/java/org/unicode/props/UcdPropertyValues.java b/unicodetools/src/main/java/org/unicode/props/UcdPropertyValues.java
@@ -67,6 +67,7 @@ public enum Age_Values implements Named {
         V14_0("14.0"),
         V15_0("15.0"),
         V15_1("15.1"),
+        V16_0("16.0"),
         Unassigned("NA");
         private final PropertyNames<Age_Values> names;
 

diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/UCD_Names.java b/unicodetools/src/main/java/org/unicode/text/UCD/UCD_Names.java
@@ -629,7 +629,8 @@ public final class UCD_Names implements UCD_Types {
     static final String[] SHORT_AGE = {
         "NA", "1.1", "2.0", "2.1", "3.0", "3.1", "3.2", "4.0", "4.1", "5.0", "5.1", "5.2", "6.0",
         "6.1", "6.2", "6.3", "7.0", "8.0", "9.0", "10.0", "11.0", "12.0", "12.1", "13.0", "14.0",
-        "15.0", "15.1",
+        "15.0", "15.1", "16.0",
+        // FIX_FOR_NEW_VERSION
     };
 
     static final String[] LONG_AGE = {
@@ -660,6 +661,8 @@ public final class UCD_Names implements UCD_Types {
         "V14_0",
         "V15_0",
         "V15_1",
+        "V16_0",
+        // FIX_FOR_NEW_VERSION
     };
 
     static final String[] GENERAL_CATEGORY = {

diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/UCD_Types.java b/unicodetools/src/main/java/org/unicode/text/UCD/UCD_Types.java
@@ -647,12 +647,14 @@ public interface UCD_Types {
             AGE140 = 24,
             AGE150 = 25,
             AGE151 = 26,
-            LIMIT_AGE = AGE151 + 1; // + FIX_FOR_NEW_VERSION;
+            AGE160 = 27,
+            LIMIT_AGE = AGE160 + 1; // + FIX_FOR_NEW_VERSION;
 
     static final String[] AGE_VERSIONS = {
         "?", "1.1.0", "2.0.0", "2.1.2", "3.0.0", "3.1.0", "3.2.0", "4.0.0", "4.1.0", "5.0.0",
         "5.1.0", "5.2.0", "6.0.0", "6.1.0", "6.2.0", "6.3.0", "7.0.0", "8.0.0", "9.0.0", "10.0.0",
-        "11.0.0", "12.0.0", "12.1.0", "13.0.0", "14.0.0", "15.0.0", "15.1.0",
+        "11.0.0", "12.0.0", "12.1.0", "13.0.0", "14.0.0", "15.0.0", "15.1.0", "16.0.0",
+        // FIX_FOR_NEW_VERSION
     };
 
     public static byte JT_C = 0,

diff --git a/unicodetools/src/main/java/org/unicode/text/utility/Settings.java b/unicodetools/src/main/java/org/unicode/text/utility/Settings.java
@@ -22,9 +22,9 @@ public class Settings {
     // Are they equivalent for our purposes?
 
     /** Used for the default version. */
-    public static final String latestVersion = "15.1.0";
+    public static final String latestVersion = "16.0.0";
 
-    public static final String lastVersion = "15.0.0"; // last released version
+    public static final String lastVersion = "15.1.0"; // last released version
 
     private static final String TRIMMED_LATEST_VERSION = trimVersion(latestVersion);
 

diff --git a/unicodetools/src/main/java/org/unicode/text/utility/Utility.java b/unicodetools/src/main/java/org/unicode/text/utility/Utility.java
@@ -889,6 +889,7 @@ public static String join(long[] array, String divider) {
 
     public static final String[] searchPath = {
         // "EXTRAS" + (FIX_FOR_NEW_VERSION == 0 ? "" : ""),
+        "16.0.0",
         "15.1.0",
         "15.0.0",
         "14.0.0",

diff --git a/unicodetools/src/main/resources/org/unicode/text/UCD/MakeUnicodeFiles.txt b/unicodetools/src/main/resources/org/unicode/text/UCD/MakeUnicodeFiles.txt
@@ -233,6 +233,9 @@ Value:  V15_0
 Value:  V15_1
 # Newly assigned in Unicode 15.1.0 (September, 2023)
 
+Value:  V16_0
+# Newly assigned in Unicode 16.0.0 (September, 2023)
+
 File:	extracted/DerivedBidiClass
 Property:	Bidi_Class
 # Bidi Class (listing UnicodeData.txt, field 4: see UAX #44: https://www.unicode.org/reports/tr44/)