Merge branch 'main' into cpp-format-arbitrary-constants

unicode-org · Feb 11, 2025 · 54e8881 · 54e8881
2 parents 4e1af73 + 030c79f
commit 54e8881
Show file tree

Hide file tree

Showing 671 changed files with 3,848 additions and 560 deletions.
diff --git a/.github/workflows/cache_retain.yml b/.github/workflows/cache_retain.yml
@@ -52,7 +52,7 @@ jobs:
           distribution: 'temurin'
           java-version: '11'
       - name: Restore read-only cache of local Maven repository
-        uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache/restore@v4.2.0
         id: cache
         with:
           path: ~/.m2/repository

diff --git a/.github/workflows/icu4c.yml b/.github/workflows/icu4c.yml
@@ -740,13 +740,13 @@ jobs:
     runs-on: ubuntu-22.04  # Updated in BRS
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-    - uses: bazelbuild/setup-bazelisk@b39c379c82683a5f25d34f0d062761f62693e0b2 # v3.0.0
+    - uses: bazel-contrib/setup-[email protected].0
     - name: Get CI Linux runner VM version
       id: linux-version
       run: |
         echo "LINUX_VERSION=$(grep -F VERSION_ID /etc/os-release | cut -d'"' -f2)" >> $GITHUB_OUTPUT
     - name: Mount bazel cache
-      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+      uses: actions/cache@v4.2.0
       with:
         path: "~/.cache/bazel"
         key: bazel-${{ runner.os }}-${{ steps.linux-version.outputs.LINUX_VERSION }}

diff --git a/.github/workflows/icu_merge_ci.yml b/.github/workflows/icu_merge_ci.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Checkout lfs objects
         run: git lfs pull
       - name: Cache local Maven repository
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@v4.2.0
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -71,7 +71,7 @@ jobs:
       - name: Checkout lfs objects
         run: git lfs pull
       - name: Lookup read-only cache of local Maven repository
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@v4.2.0
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -335,7 +335,7 @@ jobs:
       - name: Checkout lfs objects
         run: git lfs pull
       - name: Lookup read-only cache of local Maven repository
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@v4.2.0
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -349,11 +349,6 @@ jobs:
 
       - name: Build and run unicodesetperf test
         run: |
-          # This file needs to be restored  otherwise GHA cannot
-          # check-out the perfdata branch. Setting up this task with GH lfs
-          # modifies the file but the details of why and how are unknown.
-          git restore --staged tools/multi/proj/icu4cscan/old-xmls.tar.bz2;
-          git restore tools/multi/proj/icu4cscan/old-xmls.tar.bz2;
           cd icu4j;
           mvn ${SHARED_MVN_ARGS} verify -DskipITs -DskipTests;
           git status
@@ -397,7 +392,7 @@ jobs:
       - name: Checkout lfs objects
         run: git lfs pull
       - name: Lookup read-only cache of local Maven repository
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@v4.2.0
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -411,11 +406,6 @@ jobs:
 
       - name: Build and run ucharacterperf test
         run: |
-          # This file needs to be restored  otherwise GHA cannot
-          # check-out the perfdata branch. Setting up this task with GH lfs
-          # modifies the file but the details of why and how are unknown.
-          git restore --staged tools/multi/proj/icu4cscan/old-xmls.tar.bz2;
-          git restore tools/multi/proj/icu4cscan/old-xmls.tar.bz2;
           cd icu4j;
           mvn ${SHARED_MVN_ARGS} verify -DskipITs -DskipTests;
           cd perf-tests;
@@ -461,7 +451,7 @@ jobs:
       - name: Checkout lfs objects
         run: git lfs pull
       - name: Lookup read-only cache of local Maven repository
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@v4.2.0
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -475,11 +465,6 @@ jobs:
 
       - name: Build and run decimalformatperf
         run: |
-          # This file needs to be restored  otherwise GHA cannot
-          # check-out the perfdata branch. Setting up this task with GH lfs
-          # modifies the file but the details of why and how are unknown.
-          git restore --staged tools/multi/proj/icu4cscan/old-xmls.tar.bz2;
-          git restore tools/multi/proj/icu4cscan/old-xmls.tar.bz2;
           cd icu4j;
           mvn ${SHARED_MVN_ARGS} verify -DskipITs -DskipTests;
           cd perf-tests;
@@ -530,7 +515,7 @@ jobs:
       - name: Checkout lfs objects
         run: git lfs pull
       - name: Lookup read-only cache of local Maven repository
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@v4.2.0
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -546,11 +531,6 @@ jobs:
         env:
           DATA_FILE_PATH: data/collation
         run: |
-          # This file needs to be restored  otherwise GHA cannot
-          # check-out the perfdata branch. Setting up this task with GH lfs
-          # modifies the file but the details of why and how are unknown.
-          git restore --staged tools/multi/proj/icu4cscan/old-xmls.tar.bz2;
-          git restore tools/multi/proj/icu4cscan/old-xmls.tar.bz2;
           cd icu4j;
           mvn ${SHARED_MVN_ARGS} verify -DskipITs -DskipTests;
           cd perf-tests;
@@ -669,7 +649,7 @@ jobs:
       - name: Checkout lfs objects
         run: git lfs pull
       - name: Lookup read-only cache of local Maven repository
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@v4.2.0
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -685,11 +665,6 @@ jobs:
         env:
           DATA_FILE_PATH: data/conversion
         run: |
-          # This file needs to be restored  otherwise GHA cannot
-          # check-out the perfdata branch. Setting up this task with GH lfs
-          # modifies the file but the details of why and how are unknown.
-          git restore --staged tools/multi/proj/icu4cscan/old-xmls.tar.bz2;
-          git restore tools/multi/proj/icu4cscan/old-xmls.tar.bz2;
           cd icu4j;
           mvn ${SHARED_MVN_ARGS} verify -DskipITs -DskipTests;
           cd perf-tests;
@@ -752,7 +727,7 @@ jobs:
       - name: Checkout lfs objects
         run: git lfs pull
       - name: Lookup read-only cache of local Maven repository
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@v4.2.0
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -771,11 +746,6 @@ jobs:
           echo "DDIR=${ddir: -1}" >> $GITHUB_ENV
       - name: Build and run dateformatperf
         run: |
-          # This file needs to be restored  otherwise GHA cannot
-          # check-out the perfdata branch. Setting up this task with GH lfs
-          # modifies the file but the details of why and how are unknown.
-          git restore --staged tools/multi/proj/icu4cscan/old-xmls.tar.bz2
-          git restore tools/multi/proj/icu4cscan/old-xmls.tar.bz2
           cd icu4j;
           mvn ${SHARED_MVN_ARGS} verify -DskipITs -DskipTests;
           cd perf-tests;

diff --git a/LICENSE b/LICENSE
@@ -2,7 +2,7 @@ UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 2016-2024 Unicode, Inc.
+Copyright © 2016-2025 Unicode, Inc.
 
 NOTICE TO USER: Carefully read the following legal agreement. BY
 DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR

diff --git a/docs/download/76.md b/docs/download/76.md
@@ -146,6 +146,23 @@ Note: There may be additional commits on the [maint/maint-76](https://github.com
 
 ## Known Issues
 
+* Some segmentation changes should have been made as part of the Unicode 16 integration,
+  but were delayed to ICU 77:
+  * Word break: Root tailoring of colon reverted, Swedish & Finnish tailorings removed
+    ([ICU-22941](https://unicode-org.atlassian.net/browse/ICU-22941))
+    ([ICU 77 PR #3249](https://github.com/unicode-org/icu/pull/3249))
+    * These tailorings were introduced in ICU 72, but feedback has been negative,
+      and the UTC declined to adopt these changes.
+  * Updated Indic grapheme clusters to use the latest `Indic_Conjunct_Break` data
+    ([ICU-22956](https://unicode-org.atlassian.net/browse/ICU-22956))
+    ([ICU 77 PR #3257](https://github.com/unicode-org/icu/pull/3257))
+* New APIs for colloquial C++ use of C USet ([ICU-22876](https://unicode-org.atlassian.net/browse/ICU-22876))
+  and C UCollator ([ICU-22879](https://unicode-org.atlassian.net/browse/ICU-22879))
+  * Some of the new APIs do not actually compile with `U_SHOW_CPLUSPLUS_API=0`.
+    They have been fixed in ICU 77 and thoroughly tested.
+    ([ICU-22954](https://unicode-org.atlassian.net/browse/ICU-22954))
+  * For details about these APIs and an example see the
+    [“C++ Header-Only APIs” section below](#migration-issues).
 * One late CLDR 46 bug fix was accidentally omitted from ICU 46:
   [CLDR-18002](https://unicode-org.atlassian.net/browse/CLDR-18002) Fix likely subtag inconsistency
   ([CLDR PR #4105](https://github.com/unicode-org/cldr/pull/4105))
@@ -193,6 +210,9 @@ These are C++ definitions that are not exported by the ICU DLLs/libraries,
 are thus inlined into the calling code,
 and which may call ICU C APIs but not into ICU non-header-only C++ APIs.
 
+Note: Some of these new APIs did not actually compile with `U_SHOW_CPLUSPLUS_API=0`.
+They have been fixed in [ICU 77](77.md) and thoroughly tested.
+
 The header-only APIs are defined in a nested `header` namespace.
 If entry point renaming is turned off (the main namespace is `icu` rather than `icu_76` etc.),
 then the new `U_HEADER_ONLY_NAMESPACE` is `icu::header`.
@@ -261,4 +281,4 @@ ICU locale data was generated from CLDR data equivalent to:
   <artifactId>icu4j</artifactId>
   <version>76.1</version>
 </dependency>
-```
+```