From b78629be84c5553c1d2fd3ee9f8840b976c7a055 Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Mon, 25 Nov 2024 22:27:19 +0800 Subject: [PATCH 1/2] Fix publishing flutter iOS app to appstore. See also https://github.com/k2-fsa/sherpa-onnx/issues/1562 --- build-ios-shared.sh | 9 ++++++++- flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build-ios-shared.sh b/build-ios-shared.sh index c58bb300d..e75752595 100755 --- a/build-ios-shared.sh +++ b/build-ios-shared.sh @@ -258,7 +258,7 @@ for d in ios-arm64_x86_64-simulator ios-arm64; do arm64 MinimumOSVersion - 12.0 + 13.0 CFBundleIdentifier com.k2fsa.sherpa.onnx UIDeviceFamily @@ -274,6 +274,13 @@ for d in ios-arm64_x86_64-simulator ios-arm64; do 15A507 DTPlatformBuild 21A326 + SupportedArchitectures + + arm64 + x86_64 + + SupportedPlatform + ios EOF diff --git a/flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec b/flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec index 11930c4e7..82a0f0346 100644 --- a/flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec +++ b/flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec @@ -22,7 +22,7 @@ A new Flutter FFI plugin project. # `../src/*` so that the C sources can be shared among all target platforms. s.source = { :path => '.' } s.dependency 'Flutter' - s.platform = :ios, '12.0' + s.platform = :ios, '13.0' s.preserve_paths = 'sherpa_onnx.xcframework/**/*' s.vendored_frameworks = 'sherpa_onnx.xcframework' From 4d4d6a9bd550d57874ad13967d7ffaf84b875535 Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Mon, 25 Nov 2024 22:30:19 +0800 Subject: [PATCH 2/2] Release v1.10.32 --- CHANGELOG.md | 6 ++++++ CMakeLists.txt | 2 +- build-ios-shared.sh | 2 +- dart-api-examples/add-punctuations/pubspec.yaml | 2 +- dart-api-examples/audio-tagging/pubspec.yaml | 2 +- dart-api-examples/keyword-spotter/pubspec.yaml | 2 +- dart-api-examples/non-streaming-asr/pubspec.yaml | 2 +- dart-api-examples/speaker-diarization/pubspec.yaml | 2 +- .../speaker-identification/pubspec.yaml | 2 +- dart-api-examples/streaming-asr/pubspec.yaml | 2 +- dart-api-examples/tts/pubspec.yaml | 2 +- .../vad-with-non-streaming-asr/pubspec.yaml | 2 +- dart-api-examples/vad/pubspec.yaml | 2 +- flutter-examples/streaming_asr/pubspec.yaml | 4 ++-- flutter-examples/tts/pubspec.yaml | 4 ++-- flutter/sherpa_onnx/pubspec.yaml | 12 ++++++------ flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec | 2 +- .../macos/sherpa_onnx_macos.podspec | 2 +- new-release.sh | 12 ++++++------ nodejs-addon-examples/package.json | 2 +- 20 files changed, 37 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 669f2e405..6493a95e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.10.32 + +* Support cross-compiling for HarmonyOS (#1553) +* HarmonyOS support for VAD. (#1561) +* Fix publishing flutter iOS app to appstore. + ## 1.10.31 * Publish pre-built wheels for Python 3.13 (#1485) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6f94c668..f5b626b8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ project(sherpa-onnx) # Remember to update # ./CHANGELOG.md # ./new-release.sh -set(SHERPA_ONNX_VERSION "1.10.31") +set(SHERPA_ONNX_VERSION "1.10.32") # Disable warning about # diff --git a/build-ios-shared.sh b/build-ios-shared.sh index e75752595..9ac67848e 100755 --- a/build-ios-shared.sh +++ b/build-ios-shared.sh @@ -242,7 +242,7 @@ for d in ios-arm64_x86_64-simulator ios-arm64; do CFBundlePackageType FMWK CFBundleShortVersionString - 1.10.31 + 1.10.32 CFBundleSupportedPlatforms iPhoneOS diff --git a/dart-api-examples/add-punctuations/pubspec.yaml b/dart-api-examples/add-punctuations/pubspec.yaml index 55e8c5d98..fef4dd729 100644 --- a/dart-api-examples/add-punctuations/pubspec.yaml +++ b/dart-api-examples/add-punctuations/pubspec.yaml @@ -9,7 +9,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.31 + sherpa_onnx: ^1.10.32 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/audio-tagging/pubspec.yaml b/dart-api-examples/audio-tagging/pubspec.yaml index a79e925b1..fa359d89d 100644 --- a/dart-api-examples/audio-tagging/pubspec.yaml +++ b/dart-api-examples/audio-tagging/pubspec.yaml @@ -9,7 +9,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.31 + sherpa_onnx: ^1.10.32 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/keyword-spotter/pubspec.yaml b/dart-api-examples/keyword-spotter/pubspec.yaml index d79f68486..ffa074a23 100644 --- a/dart-api-examples/keyword-spotter/pubspec.yaml +++ b/dart-api-examples/keyword-spotter/pubspec.yaml @@ -9,7 +9,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.31 + sherpa_onnx: ^1.10.32 # sherpa_onnx: # path: ../../flutter/sherpa_onnx path: ^1.9.0 diff --git a/dart-api-examples/non-streaming-asr/pubspec.yaml b/dart-api-examples/non-streaming-asr/pubspec.yaml index 3c61a0cb2..52ee859e6 100644 --- a/dart-api-examples/non-streaming-asr/pubspec.yaml +++ b/dart-api-examples/non-streaming-asr/pubspec.yaml @@ -10,7 +10,7 @@ environment: # Add regular dependencies here. dependencies: - sherpa_onnx: ^1.10.31 + sherpa_onnx: ^1.10.32 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/speaker-diarization/pubspec.yaml b/dart-api-examples/speaker-diarization/pubspec.yaml index 6fb714d10..6706e28d1 100644 --- a/dart-api-examples/speaker-diarization/pubspec.yaml +++ b/dart-api-examples/speaker-diarization/pubspec.yaml @@ -8,7 +8,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.31 + sherpa_onnx: ^1.10.32 # sherpa_onnx: # path: ../../flutter/sherpa_onnx path: ^1.9.0 diff --git a/dart-api-examples/speaker-identification/pubspec.yaml b/dart-api-examples/speaker-identification/pubspec.yaml index 36969fb1d..4b47846b8 100644 --- a/dart-api-examples/speaker-identification/pubspec.yaml +++ b/dart-api-examples/speaker-identification/pubspec.yaml @@ -9,7 +9,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.31 + sherpa_onnx: ^1.10.32 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/streaming-asr/pubspec.yaml b/dart-api-examples/streaming-asr/pubspec.yaml index ec6270297..cfc9037ab 100644 --- a/dart-api-examples/streaming-asr/pubspec.yaml +++ b/dart-api-examples/streaming-asr/pubspec.yaml @@ -11,7 +11,7 @@ environment: # Add regular dependencies here. dependencies: - sherpa_onnx: ^1.10.31 + sherpa_onnx: ^1.10.32 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/tts/pubspec.yaml b/dart-api-examples/tts/pubspec.yaml index ed55db1eb..9cf7049bc 100644 --- a/dart-api-examples/tts/pubspec.yaml +++ b/dart-api-examples/tts/pubspec.yaml @@ -8,7 +8,7 @@ environment: # Add regular dependencies here. dependencies: - sherpa_onnx: ^1.10.31 + sherpa_onnx: ^1.10.32 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/vad-with-non-streaming-asr/pubspec.yaml b/dart-api-examples/vad-with-non-streaming-asr/pubspec.yaml index 6d331d8f5..ca0d08cad 100644 --- a/dart-api-examples/vad-with-non-streaming-asr/pubspec.yaml +++ b/dart-api-examples/vad-with-non-streaming-asr/pubspec.yaml @@ -10,7 +10,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.31 + sherpa_onnx: ^1.10.32 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/vad/pubspec.yaml b/dart-api-examples/vad/pubspec.yaml index b16bcb64b..cd1acfbd2 100644 --- a/dart-api-examples/vad/pubspec.yaml +++ b/dart-api-examples/vad/pubspec.yaml @@ -9,7 +9,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.31 + sherpa_onnx: ^1.10.32 path: ^1.9.0 args: ^2.5.0 diff --git a/flutter-examples/streaming_asr/pubspec.yaml b/flutter-examples/streaming_asr/pubspec.yaml index 1eb29cbd4..680d9d346 100644 --- a/flutter-examples/streaming_asr/pubspec.yaml +++ b/flutter-examples/streaming_asr/pubspec.yaml @@ -5,7 +5,7 @@ description: > publish_to: 'none' -version: 1.10.31 +version: 1.10.32 topics: - speech-recognition @@ -31,7 +31,7 @@ dependencies: record: ^5.1.0 url_launcher: ^6.2.6 - sherpa_onnx: ^1.10.31 + sherpa_onnx: ^1.10.32 # sherpa_onnx: # path: ../../flutter/sherpa_onnx diff --git a/flutter-examples/tts/pubspec.yaml b/flutter-examples/tts/pubspec.yaml index 669a1ed4d..f8eca471a 100644 --- a/flutter-examples/tts/pubspec.yaml +++ b/flutter-examples/tts/pubspec.yaml @@ -5,7 +5,7 @@ description: > publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 1.10.31 +version: 1.10.32 environment: sdk: ">=2.17.0 <4.0.0" @@ -18,7 +18,7 @@ dependencies: cupertino_icons: ^1.0.6 path_provider: ^2.1.3 path: ^1.9.0 - sherpa_onnx: ^1.10.31 + sherpa_onnx: ^1.10.32 # sherpa_onnx: # path: ../../flutter/sherpa_onnx url_launcher: 6.2.6 diff --git a/flutter/sherpa_onnx/pubspec.yaml b/flutter/sherpa_onnx/pubspec.yaml index 675ed844a..f5da2dbb6 100644 --- a/flutter/sherpa_onnx/pubspec.yaml +++ b/flutter/sherpa_onnx/pubspec.yaml @@ -17,7 +17,7 @@ topics: - voice-activity-detection # remember to change the version in ../sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec -version: 1.10.31 +version: 1.10.32 homepage: https://github.com/k2-fsa/sherpa-onnx @@ -30,23 +30,23 @@ dependencies: flutter: sdk: flutter - sherpa_onnx_android: ^1.10.31 + sherpa_onnx_android: ^1.10.32 # sherpa_onnx_android: # path: ../sherpa_onnx_android - sherpa_onnx_macos: ^1.10.31 + sherpa_onnx_macos: ^1.10.32 # sherpa_onnx_macos: # path: ../sherpa_onnx_macos - sherpa_onnx_linux: ^1.10.31 + sherpa_onnx_linux: ^1.10.32 # sherpa_onnx_linux: # path: ../sherpa_onnx_linux - sherpa_onnx_windows: ^1.10.31 + sherpa_onnx_windows: ^1.10.32 # sherpa_onnx_windows: # path: ../sherpa_onnx_windows - sherpa_onnx_ios: ^1.10.31 + sherpa_onnx_ios: ^1.10.32 # sherpa_onnx_ios: # path: ../sherpa_onnx_ios diff --git a/flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec b/flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec index 82a0f0346..e840a2225 100644 --- a/flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec +++ b/flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec @@ -7,7 +7,7 @@ # https://groups.google.com/g/dart-ffi/c/nUATMBy7r0c Pod::Spec.new do |s| s.name = 'sherpa_onnx_ios' - s.version = '1.10.31' + s.version = '1.10.32' s.summary = 'A new Flutter FFI plugin project.' s.description = <<-DESC A new Flutter FFI plugin project. diff --git a/flutter/sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec b/flutter/sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec index 95b0970b3..100966033 100644 --- a/flutter/sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec +++ b/flutter/sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec @@ -4,7 +4,7 @@ # Pod::Spec.new do |s| s.name = 'sherpa_onnx_macos' - s.version = '1.10.31' + s.version = '1.10.32' s.summary = 'sherpa-onnx Flutter FFI plugin project.' s.description = <<-DESC sherpa-onnx Flutter FFI plugin project. diff --git a/new-release.sh b/new-release.sh index 7e6ed56b5..eaf868971 100755 --- a/new-release.sh +++ b/new-release.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -sed -i.bak 's/1\.10\.30/1\.10\.31/g' ./build-ios-shared.sh -find flutter -name *.yaml -type f -exec sed -i.bak 's/1\.10\.30/1\.10\.31/g' {} \; -find dart-api-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.30/1\.10\.31/g' {} \; -find flutter-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.30/1\.10\.31/g' {} \; -find flutter -name *.podspec -type f -exec sed -i.bak 's/1\.10\.30/1\.10\.31/g' {} \; -find nodejs-addon-examples -name package.json -type f -exec sed -i.bak 's/1\.10\.30/1\.10\.31/g' {} \; +sed -i.bak 's/1\.10\.31/1\.10\.32/g' ./build-ios-shared.sh +find flutter -name *.yaml -type f -exec sed -i.bak 's/1\.10\.31/1\.10\.32/g' {} \; +find dart-api-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.31/1\.10\.32/g' {} \; +find flutter-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.31/1\.10\.32/g' {} \; +find flutter -name *.podspec -type f -exec sed -i.bak 's/1\.10\.31/1\.10\.32/g' {} \; +find nodejs-addon-examples -name package.json -type f -exec sed -i.bak 's/1\.10\.31/1\.10\.32/g' {} \; diff --git a/nodejs-addon-examples/package.json b/nodejs-addon-examples/package.json index ee4404123..47bed5b88 100644 --- a/nodejs-addon-examples/package.json +++ b/nodejs-addon-examples/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "sherpa-onnx-node": "^1.10.31" + "sherpa-onnx-node": "^1.10.32" } }