From 357a326f17335fc0690f5b698e72f69aa608f6bb Mon Sep 17 00:00:00 2001 From: apotocki Date: Fri, 3 May 2024 23:24:42 +0200 Subject: [PATCH] version 75.1.0 --- .github/workflows/main.yml | 2 +- .gitmodules | 2 +- README.md | 10 +++++----- icu4c-iosx.podspec | 2 +- scripts/build.sh | 18 +++++++++--------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c17541..319828e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: types: [published] push: tags: - - 74.** + - 75.** workflow_dispatch: jobs: Build: diff --git a/.gitmodules b/.gitmodules index 1a54d88..8552112 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "icu"] path = icu url = https://github.com/unicode-org/icu - branch = maint/maint-74 + branch = maint/maint-75 diff --git a/README.md b/README.md index c0a3d9f..beb8c61 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ ## ICU for iOS, visionOS, macOS (Intel & Apple Silicon M1) & Catalyst - arm64 / x86_64 -Supported versions: 74.2 +Supported versions: 75.1 -This repo provides a universal script for building static ICU libraries for use in iOS, visionOS, and macOS applications. The repo contains "icu" submodule that is taken from https://github.com/unicode-org/icu . The repo branches correspond to the suitable branches of ICU repo. E.g. "74" branch corresponds to "maint/maint-74" branch. +This repo provides a universal script for building static ICU libraries for use in iOS, visionOS, and macOS applications. The repo contains "icu" submodule that is taken from https://github.com/unicode-org/icu . The repo branches correspond to the suitable branches of ICU repo. E.g. "75" branch corresponds to "maint/maint-75" branch. ## Prerequisites 1) Xcode must be installed because xcodebuild is used to create xcframeworks @@ -13,7 +13,7 @@ This repo provides a universal script for building static ICU libraries for use - Manually ``` # clone the repo - git clone -b 74 --recursive https://github.com/apotocki/icu4c-iosx + git clone -b 75 --recursive https://github.com/apotocki/icu4c-iosx # build libraries cd icu4c-iosx @@ -24,9 +24,9 @@ This repo provides a universal script for building static ICU libraries for use - Use cocoapods. Add the following lines into your project's Podfile: ``` use_frameworks! - pod 'icu4c-iosx', '~> 74.2' + pod 'icu4c-iosx', '~> 75.1' # or optionally more precisely - # pod 'icu4c-iosx', :git => 'https://github.com/apotocki/icu4c-iosx', :tag => '74.2.8', :submodules => 'true' + # pod 'icu4c-iosx', :git => 'https://github.com/apotocki/icu4c-iosx', :tag => '75.1.0', :submodules => 'true' ``` install new dependency: ``` diff --git a/icu4c-iosx.podspec b/icu4c-iosx.podspec index be906fa..1405ba0 100644 --- a/icu4c-iosx.podspec +++ b/icu4c-iosx.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "icu4c-iosx" - s.version = "74.2.8" + s.version = "75.1.0" s.summary = "ICU XCFramework for macOS, iOS, and visionOS, including both arm64 and x86_64 builds for macOS, Mac Catalyst, iOS Simulator, and visionOS Simulator." s.homepage = "https://github.com/apotocki/icu4c-iosx" s.license = "BSD" diff --git a/scripts/build.sh b/scripts/build.sh index af63185..8bc497c 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -4,7 +4,7 @@ set -e THREAD_COUNT=$(sysctl hw.ncpu | awk '{print $2}') HOST_ARC=$( uname -m ) XCODE_ROOT=$( xcode-select -print-path ) -ICU_VER=maint/maint-74 +ICU_VER=maint/maint-75 #MACOSX_VERSION_ARM=12.3 #MACOSX_VERSION_X86_64=10.13 IOS_VERSION=13.4 @@ -41,10 +41,10 @@ if [ -z "${WITH_DATA_PACKAGING}" ]; then fi echo "USING WITH_DATA_PACKAGING: $WITH_DATA_PACKAGING" -#explicit 74.2 +#explicit 75.1 pushd icu -git fetch --depth=1 origin 2d029329c82c7792b985024b2bdab5fc7278fbc8 -git reset --hard 2d029329c82c7792b985024b2bdab5fc7278fbc8 +git fetch --depth=1 origin 7750081bda4b3bc1768ae03849ec70f67ea10625 +git reset --hard 7750081bda4b3bc1768ae03849ec70f67ea10625 popd COMMON_CONFIGURE_ARGS="--enable-static --disable-shared prefix=$INSTALL_DIR --with-data-packaging=$WITH_DATA_PACKAGING" @@ -172,18 +172,18 @@ mkdir $INSTALL_DIR/frameworks create_xcframework() { - PARAMS="-library $ICU_VER_NAME-macos-build/source/lib/lib$1.a \ + LIBARGS="-library $ICU_VER_NAME-macos-build/source/lib/lib$1.a \ -library $ICU_VER_NAME-catalyst-build/source/lib/lib$1.a \ -library $ICU_VER_NAME-ios.sim-build/source/lib/lib$1.a \ -library $ICU_VER_NAME-ios-arm64-build/source/lib/lib$1.a" if [ -d $XROSSIMSYSROOT/SDKs/XRSimulator.sdk ]; then - PARAMS="$PARAMS -library $ICU_VER_NAME-xros.sim-build/source/lib/lib$1.a" + LIBARGS="$LIBARGS -library $ICU_VER_NAME-xros.sim-build/source/lib/lib$1.a" fi - if [ -d $XROSSYSROOT ]; then - PARAMS="$PARAMS -library $ICU_VER_NAME-xros-arm64-build/source/lib/lib$1.a" + if [ -d $XROSSYSROOT/SDKs/XROS.sdk ]; then + LIBARGS="$LIBARGS -library $ICU_VER_NAME-xros-arm64-build/source/lib/lib$1.a" fi - xcodebuild -create-xcframework $PARAMS -output $INSTALL_DIR/frameworks/$1.xcframework + xcodebuild -create-xcframework $LIBARGS -output $INSTALL_DIR/frameworks/$1.xcframework } create_xcframework icudata