Skip to content

Commit

Permalink
version 75.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
apotocki committed May 3, 2024
1 parent 1de915e commit 357a326
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
types: [published]
push:
tags:
- 74.**
- 75.**
workflow_dispatch:
jobs:
Build:
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "icu"]
path = icu
url = https://github.com/unicode-org/icu
branch = maint/maint-74
branch = maint/maint-75
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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:
```
Expand Down
2 changes: 1 addition & 1 deletion icu4c-iosx.podspec
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
18 changes: 9 additions & 9 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 357a326

Please sign in to comment.