build: update update-checkout to ICU 69

Unify the non-Darwin targets to ICU 69. Windows has been using ICU 69
since 5.3, Linux was at 65.

Author: compnerd

utils/build-windows-toolchain.bat

@@ -70,7 +70,6 @@ if "%TestArg:~-1%"=="," (set TestArg=%TestArg:~0,-1%) else (set TestArg= )
 set SkipPackagingArg=-SkipPackaging
 if not "%SKIP_PACKAGING%"=="1" set "SkipPackagingArg= "
 
-call :CloneDependencies || (exit /b)
 call :CloneRepositories || (exit /b)
 
 :: We only have write access to BuildRoot, so use that as the image root.
@@ -106,7 +105,6 @@ rem git -C "%SourceRoot%\swift" checkout-index --force --all
 
 set "args=%args% --skip-repository swift"
 set "args=%args% --skip-repository ninja"
-set "args=%args% --skip-repository icu"
 set "args=%args% --skip-repository swift-integration-tests"
 set "args=%args% --skip-repository swift-stress-tester"
 set "args=%args% --skip-repository swift-xcode-playground-support"
@@ -116,17 +114,4 @@ call "%SourceRoot%\swift\utils\update-checkout.cmd" %args% --clone --skip-histor
 goto :eof
 endlocal
 
-:CloneDependencies
-setlocal enableextensions enabledelayedexpansion
-
-:: Always enable symbolic links
-git config --global core.symlink true
-
-:: FIXME(compnerd) avoid the fresh clone
-rd /s /q icu
-git clone --quiet --no-tags --depth 1 --branch maint/maint-69 https://github.com/unicode-org/icu
-
-goto :eof
-endlocal
-
 :end

utils/update_checkout/update-checkout-config.json

@@ -46,10 +46,6 @@
             "remote": { "id": "apple/swift-xcode-playground-support" } },
         "ninja": {
             "remote": { "id": "ninja-build/ninja" } },
-        "icu": {
-            "remote": { "id": "unicode-org/icu" },
-            "platforms": [ "Linux" ]
-        },
         "yams": {
             "remote": { "id": "jpsim/Yams" }
         },
@@ -92,6 +88,9 @@
         "curl": {
           "remote": { "id": "curl/curl" }
         },
+        "icu": {
+          "remote": { "id": "unicode-org/icu" }
+        },
         "libxml2": {
           "remote": { "id": "gnome/libxml2" }
         },
@@ -128,7 +127,6 @@
                 "swift-integration-tests": "main",
                 "swift-xcode-playground-support": "main",
                 "ninja": "release",
-                "icu": "release-65-1",
                 "yams": "5.0.1",
                 "cmake": "v3.24.2",
                 "indexstore-db": "main",
@@ -145,6 +143,7 @@
                 "swift-experimental-string-processing": "swift/main",
                 "wasi-libc": "wasi-sdk-20",
                 "curl": "curl-8_4_0",
+                "icu": "maint/maint-69",
                 "libxml2": "v2.11.5",
                 "zlib": "v1.3"
             }