Skip to content

Commit

Permalink
Release v1.10.35
Browse files Browse the repository at this point in the history
  • Loading branch information
csukuangfj committed Dec 12, 2024
1 parent be87f86 commit 0453c81
Show file tree
Hide file tree
Showing 33 changed files with 67 additions and 52 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 1.10.35

* Add missing changes about speaker identfication demo for HarmonyOS (#1612)
* Provide sherpa-onnx.aar for Android (#1615)
* Use aar in Android Java demo. (#1616)

## 1.10.34

* Fix building node-addon package (#1598)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ project(sherpa-onnx)
# Remember to update
# ./CHANGELOG.md
# ./new-release.sh
set(SHERPA_ONNX_VERSION "1.10.34")
set(SHERPA_ONNX_VERSION "1.10.35")

# Disable warning about
#
Expand Down
6 changes: 3 additions & 3 deletions android/SherpaOnnxAar/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
git clone https://github.com/k2-fsa/sherpa-onnx
cd sherpa-onnx
wget https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.34/sherpa-onnx-v1.10.34-android.tar.bz2
tar xvf sherpa-onnx-v1.10.34-android.tar.bz2
wget https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.35/sherpa-onnx-v1.10.35-android.tar.bz2
tar xvf sherpa-onnx-v1.10.35-android.tar.bz2
cp -v jniLibs/arm64-v8a/* android/SherpaOnnxAar/sherpa_onnx/src/main/jniLibs/arm64-v8a/
cp -v jniLibs/armeabi-v7a/* android/SherpaOnnxAar/sherpa_onnx/src/main/jniLibs/armeabi-v7a/
Expand All @@ -16,5 +16,5 @@ cd android/SherpaOnnxAar
./gradlew :sherpa_onnx:assembleRelease
ls -lh ./sherpa_onnx/build/outputs/aar/sherpa_onnx-release.aar
cp ./sherpa_onnx/build/outputs/aar/sherpa_onnx-release.aar ../../sherpa-onnx-1.10.34.aar
cp ./sherpa_onnx/build/outputs/aar/sherpa_onnx-release.aar ../../sherpa-onnx-1.10.35.aar
```
2 changes: 1 addition & 1 deletion build-ios-shared.sh
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ for d in ios-arm64_x86_64-simulator ios-arm64; do
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.10.34</string>
<string>1.10.35</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>iPhoneOS</string>
Expand Down
2 changes: 1 addition & 1 deletion dart-api-examples/add-punctuations/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ environment:
sdk: ">=3.0.0 <4.0.0"

dependencies:
sherpa_onnx: ^1.10.34
sherpa_onnx: ^1.10.35
path: ^1.9.0
args: ^2.5.0

Expand Down
2 changes: 1 addition & 1 deletion dart-api-examples/audio-tagging/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ environment:
sdk: ">=3.0.0 <4.0.0"

dependencies:
sherpa_onnx: ^1.10.34
sherpa_onnx: ^1.10.35
path: ^1.9.0
args: ^2.5.0

Expand Down
2 changes: 1 addition & 1 deletion dart-api-examples/keyword-spotter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ environment:
sdk: ">=3.0.0 <4.0.0"

dependencies:
sherpa_onnx: ^1.10.34
sherpa_onnx: ^1.10.35
# sherpa_onnx:
# path: ../../flutter/sherpa_onnx
path: ^1.9.0
Expand Down
2 changes: 1 addition & 1 deletion dart-api-examples/non-streaming-asr/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ environment:

# Add regular dependencies here.
dependencies:
sherpa_onnx: ^1.10.34
sherpa_onnx: ^1.10.35
path: ^1.9.0
args: ^2.5.0

Expand Down
2 changes: 1 addition & 1 deletion dart-api-examples/speaker-diarization/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ environment:
sdk: ">=3.0.0 <4.0.0"

dependencies:
sherpa_onnx: ^1.10.34
sherpa_onnx: ^1.10.35
# sherpa_onnx:
# path: ../../flutter/sherpa_onnx
path: ^1.9.0
Expand Down
2 changes: 1 addition & 1 deletion dart-api-examples/speaker-identification/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ environment:
sdk: ">=3.0.0 <4.0.0"

dependencies:
sherpa_onnx: ^1.10.34
sherpa_onnx: ^1.10.35
path: ^1.9.0
args: ^2.5.0

Expand Down
2 changes: 1 addition & 1 deletion dart-api-examples/streaming-asr/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ environment:

# Add regular dependencies here.
dependencies:
sherpa_onnx: ^1.10.34
sherpa_onnx: ^1.10.35
path: ^1.9.0
args: ^2.5.0

Expand Down
2 changes: 1 addition & 1 deletion dart-api-examples/tts/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ environment:

# Add regular dependencies here.
dependencies:
sherpa_onnx: ^1.10.34
sherpa_onnx: ^1.10.35
path: ^1.9.0
args: ^2.5.0

Expand Down
2 changes: 1 addition & 1 deletion dart-api-examples/vad-with-non-streaming-asr/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ environment:
sdk: ">=3.0.0 <4.0.0"

dependencies:
sherpa_onnx: ^1.10.34
sherpa_onnx: ^1.10.35
path: ^1.9.0
args: ^2.5.0

Expand Down
2 changes: 1 addition & 1 deletion dart-api-examples/vad/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ environment:
sdk: ">=3.0.0 <4.0.0"

dependencies:
sherpa_onnx: ^1.10.34
sherpa_onnx: ^1.10.35
path: ^1.9.0
args: ^2.5.0

Expand Down
4 changes: 2 additions & 2 deletions flutter-examples/streaming_asr/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >
publish_to: 'none'

version: 1.10.34
version: 1.10.35

topics:
- speech-recognition
Expand All @@ -31,7 +31,7 @@ dependencies:
record: ^5.1.0
url_launcher: ^6.2.6

sherpa_onnx: ^1.10.34
sherpa_onnx: ^1.10.35
# sherpa_onnx:
# path: ../../flutter/sherpa_onnx

Expand Down
4 changes: 2 additions & 2 deletions flutter-examples/tts/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >
publish_to: 'none' # Remove this line if you wish to publish to pub.dev

version: 1.10.34
version: 1.10.35

environment:
sdk: ">=2.17.0 <4.0.0"
Expand All @@ -18,7 +18,7 @@ dependencies:
cupertino_icons: ^1.0.6
path_provider: ^2.1.3
path: ^1.9.0
sherpa_onnx: ^1.10.34
sherpa_onnx: ^1.10.35
# sherpa_onnx:
# path: ../../flutter/sherpa_onnx
url_launcher: 6.2.6
Expand Down
12 changes: 6 additions & 6 deletions flutter/sherpa_onnx/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.34
version: 1.10.35

homepage: https://github.com/k2-fsa/sherpa-onnx

Expand All @@ -30,23 +30,23 @@ dependencies:
flutter:
sdk: flutter

sherpa_onnx_android: ^1.10.34
sherpa_onnx_android: ^1.10.35
# sherpa_onnx_android:
# path: ../sherpa_onnx_android

sherpa_onnx_macos: ^1.10.34
sherpa_onnx_macos: ^1.10.35
# sherpa_onnx_macos:
# path: ../sherpa_onnx_macos

sherpa_onnx_linux: ^1.10.34
sherpa_onnx_linux: ^1.10.35
# sherpa_onnx_linux:
# path: ../sherpa_onnx_linux

sherpa_onnx_windows: ^1.10.34
sherpa_onnx_windows: ^1.10.35
# sherpa_onnx_windows:
# path: ../sherpa_onnx_windows

sherpa_onnx_ios: ^1.10.34
sherpa_onnx_ios: ^1.10.35
# sherpa_onnx_ios:
# path: ../sherpa_onnx_ios

Expand Down
2 changes: 1 addition & 1 deletion flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.34'
s.version = '1.10.35'
s.summary = 'A new Flutter FFI plugin project.'
s.description = <<-DESC
A new Flutter FFI plugin project.
Expand Down
2 changes: 1 addition & 1 deletion flutter/sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
Pod::Spec.new do |s|
s.name = 'sherpa_onnx_macos'
s.version = '1.10.34'
s.version = '1.10.35'
s.summary = 'sherpa-onnx Flutter FFI plugin project.'
s.description = <<-DESC
sherpa-onnx Flutter FFI plugin project.
Expand Down
9 changes: 9 additions & 0 deletions harmony-os/SherpaOnnxHar/release.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash
set -ex

export PATH=/Users/fangjun/software/command-line-tools/bin:$PATH

hvigorw clean --no-daemon
hvigorw --mode module -p product=default -p module=sherpa_onnx@default assembleHar --analyze=normal --parallel --incremental --no-daemon

ohpm publish ./sherpa_onnx/build/default/outputs/default/sherpa_onnx.har
2 changes: 1 addition & 1 deletion harmony-os/SherpaOnnxHar/sherpa_onnx/BuildProfile.ets
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Use these variables when you tailor your ArkTS code. They must be of the const type.
*/
export const HAR_VERSION = '1.10.33';
export const HAR_VERSION = '1.10.35';
export const BUILD_MODE_NAME = 'debug';
export const DEBUG = true;
export const TARGET_NAME = 'default';
Expand Down
2 changes: 1 addition & 1 deletion harmony-os/SherpaOnnxHar/sherpa_onnx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ or update your `oh-package.json5` to include the following:

```
"dependencies": {
"sherpa_onnx": "1.10.34",
"sherpa_onnx": "1.10.35",
},
```

Expand Down
2 changes: 1 addition & 1 deletion harmony-os/SherpaOnnxHar/sherpa_onnx/oh-package.json5
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sherpa_onnx",
"version": "1.10.34",
"version": "1.10.35",
"description": "On-device speech-to-text, text-to-speech, and speaker diarization using Next-gen Kaldi without Internet connection",
"main": "Index.ets",
"author": "The next-gen Kaldi team",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "",
"license": "",
"dependencies": {
"sherpa_onnx": "1.10.34"
"sherpa_onnx": "1.10.35"
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "",
"license": "",
"dependencies": {
"sherpa_onnx": "1.10.34",
"sherpa_onnx": "1.10.35",
}
}

2 changes: 1 addition & 1 deletion harmony-os/SherpaOnnxStreamingAsr/entry/oh-package.json5
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "",
"license": "",
"dependencies": {
"sherpa_onnx": "1.10.34",
"sherpa_onnx": "1.10.35",
}
}

2 changes: 1 addition & 1 deletion harmony-os/SherpaOnnxTts/entry/oh-package.json5
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "",
"license": "",
"dependencies": {
"sherpa_onnx": "1.10.34",
"sherpa_onnx": "1.10.35",
}
}

2 changes: 1 addition & 1 deletion harmony-os/SherpaOnnxVadAsr/entry/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Introduction

Please download ./sherpa_onnx-v1.10.34.har
Please download ./sherpa_onnx-v1.10.35.har
from <https://huggingface.co/csukuangfj/sherpa-onnx-harmony-os/tree/main/har>

Hint: For users who have no access to huggingface, please use
Expand Down
2 changes: 1 addition & 1 deletion harmony-os/SherpaOnnxVadAsr/entry/oh-package.json5
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"license": "",
"dependencies": {
// please see https://ohpm.openharmony.cn/#/cn/detail/sherpa_onnx
"sherpa_onnx": "1.10.34",
"sherpa_onnx": "1.10.35",
}
}

6 changes: 3 additions & 3 deletions jitpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ jdk:
- openjdk17

before_install:
- wget https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.34/sherpa-onnx-1.10.34.aar
- wget https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.35/sherpa-onnx-1.10.35.aar

install:
- FILE="-Dfile=sherpa-onnx-1.10.34.aar"
- mvn install:install-file $FILE -DgroupId=com.k2fsa.sherpa.onnx -DartifactId=sherpa-onnx -Dversion=1.10.34 -Dpackaging=aar -DgeneratePom=true
- FILE="-Dfile=sherpa-onnx-1.10.35.aar"
- mvn install:install-file $FILE -DgroupId=com.k2fsa.sherpa.onnx -DartifactId=sherpa-onnx -Dversion=1.10.35 -Dpackaging=aar -DgeneratePom=true
22 changes: 11 additions & 11 deletions new-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

set -ex

sed -i.bak 's/1\.10\.33/1\.10\.34/g' ./build-ios-shared.sh
sed -i.bak 's/1\.10\.33/1\.10\.34/g' ./pom.xml
sed -i.bak 's/1\.10\.33/1\.10\.34/g' ./jitpack.yml
sed -i.bak 's/1\.10\.33/1\.10\.34/g' ./android/SherpaOnnxAar/README.md
sed -i.bak 's/1\.10\.34/1\.10\.35/g' ./build-ios-shared.sh
sed -i.bak 's/1\.10\.34/1\.10\.35/g' ./pom.xml
sed -i.bak 's/1\.10\.34/1\.10\.35/g' ./jitpack.yml
sed -i.bak 's/1\.10\.34/1\.10\.35/g' ./android/SherpaOnnxAar/README.md

find flutter -name *.yaml -type f -exec sed -i.bak 's/1\.10\.33/1\.10\.34/g' {} \;
find dart-api-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.33/1\.10\.34/g' {} \;
find flutter-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.33/1\.10\.34/g' {} \;
find flutter -name *.podspec -type f -exec sed -i.bak 's/1\.10\.33/1\.10\.34/g' {} \;
find nodejs-addon-examples -name package.json -type f -exec sed -i.bak 's/1\.10\.33/1\.10\.34/g' {} \;
find flutter -name *.yaml -type f -exec sed -i.bak 's/1\.10\.34/1\.10\.35/g' {} \;
find dart-api-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.34/1\.10\.35/g' {} \;
find flutter-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.34/1\.10\.35/g' {} \;
find flutter -name *.podspec -type f -exec sed -i.bak 's/1\.10\.34/1\.10\.35/g' {} \;
find nodejs-addon-examples -name package.json -type f -exec sed -i.bak 's/1\.10\.34/1\.10\.35/g' {} \;

find harmony-os -name "README.md" -type f -exec sed -i.bak 's/1\.10\.33/1\.10\.34/g' {} \;
find harmony-os -name oh-package.json5 -type f -exec sed -i.bak 's/1\.10\.33/1\.10\.34/g' {} \;
find harmony-os -name "README.md" -type f -exec sed -i.bak 's/1\.10\.34/1\.10\.35/g' {} \;
find harmony-os -name oh-package.json5 -type f -exec sed -i.bak 's/1\.10\.34/1\.10\.35/g' {} \;
2 changes: 1 addition & 1 deletion nodejs-addon-examples/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"dependencies": {
"sherpa-onnx-node": "^1.10.34"
"sherpa-onnx-node": "^1.10.35"
}
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.k2fsa.sherpa.onnx</groupId>
<artifactId>sherpa-onnx-android</artifactId>
<version>1.10.34</version>
<version>1.10.35</version>
<url>https://github.com/k2-fsa/sherpa-onnx</url>
<packaging>pom</packaging>
<description>First Android Library</description>
Expand Down

0 comments on commit 0453c81

Please sign in to comment.