xuning / sherpaonnx

转到一个项目
Toggle navigation Toggle navigation pinning
Fangjun Kuang
Committed by GitHub
9a480126 1 parent e993c085

Use xcframework for Flutter iOS plugin. (#1547)

内嵌 并排对比
正在显示 24 个修改的文件 包含 216 行增加 和 49 行删除
@@ -481,11 +481,8 @@ jobs: @@ -481,11 +481,8 @@ jobs:
481 - name: Copy pre-built libs 481 - name: Copy pre-built libs
482 shell: bash 482 shell: bash
483 run: | 483 run: |
484 - echo "----ios-arm64----"  
485 - cp -v build-ios-shared/ios-arm64/libsherpa-onnx-c-api.dylib flutter/sherpa_onnx_ios/ios/  
486 - cp -v build-ios-shared/ios-onnxruntime/onnxruntime.xcframework/ios-arm64/onnxruntime.a flutter/sherpa_onnx_ios/ios/libonnxruntime.a  
487 -  
488 - ls -lh flutter/sherpa_onnx_ios/ios/libonnxruntime.a 484 + echo "----ios arm64 and arm64_x64_simulator----"
  485 + cp -av build-ios-shared/sherpa_onnx.xcframework flutter/sherpa_onnx_ios/ios/
489 486
490 mv -v flutter/sherpa_onnx_ios /tmp/to_be_published 487 mv -v flutter/sherpa_onnx_ios /tmp/to_be_published
491 488
  1 +## 1.10.31
  2 +
  3 +* Publish pre-built wheels for Python 3.13 (#1485)
  4 +* Publish pre-built macos xcframework (#1490)
  5 +* Fix reading tokens.txt on Windows. (#1497)
  6 +* Add two-pass ASR Android APKs for Moonshine models. (#1499)
  7 +* Support building GPU-capable sherpa-onnx on Linux aarch64. (#1500)
  8 +* Publish pre-built wheels with CUDA support for Linux aarch64. (#1507)
  9 +* Export the English TTS model from MeloTTS (#1509)
  10 +* Add Lazarus example for Moonshine models. (#1532)
  11 +* Add isolate_tts demo (#1529)
  12 +* Add WebAssembly example for VAD + Moonshine models. (#1535)
  13 +* Add Android APK for streaming Paraformer ASR (#1538)
  14 +* Support static build for windows arm64. (#1539)
  15 +* Use xcframework for Flutter iOS plugin to support iOS simulators.
  16 +
1 ## 1.10.30 17 ## 1.10.30
2 18
3 * Fix building node-addon for Windows x86. (#1469) 19 * Fix building node-addon for Windows x86. (#1469)
@@ -8,10 +8,9 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) @@ -8,10 +8,9 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
8 project(sherpa-onnx) 8 project(sherpa-onnx)
9 9
10 # Remember to update 10 # Remember to update
11 -# ./nodejs-addon-examples  
12 -# ./dart-api-examples/  
13 # ./CHANGELOG.md 11 # ./CHANGELOG.md
14 -set(SHERPA_ONNX_VERSION "1.10.30") 12 +# ./new-release.sh
  13 +set(SHERPA_ONNX_VERSION "1.10.31")
15 14
16 # Disable warning about 15 # Disable warning about
17 # 16 #
@@ -76,6 +76,8 @@ if [[ ! -f build/simulator_x86_64/install/lib/libsherpa-onnx-c-api.dylib ]]; the @@ -76,6 +76,8 @@ if [[ ! -f build/simulator_x86_64/install/lib/libsherpa-onnx-c-api.dylib ]]; the
76 -B build/simulator_x86_64 76 -B build/simulator_x86_64
77 77
78 cmake --build build/simulator_x86_64 -j 4 --target install 78 cmake --build build/simulator_x86_64 -j 4 --target install
  79 +else
  80 + echo "Skip building for simulator (x86_64)"
79 fi 81 fi
80 82
81 echo "Building for simulator (arm64)" 83 echo "Building for simulator (arm64)"
@@ -107,6 +109,8 @@ if [[ ! -f build/simulator_arm64/install/lib/libsherpa-onnx-c-api.dylib ]]; then @@ -107,6 +109,8 @@ if [[ ! -f build/simulator_arm64/install/lib/libsherpa-onnx-c-api.dylib ]]; then
107 -B build/simulator_arm64 109 -B build/simulator_arm64
108 110
109 cmake --build build/simulator_arm64 -j 4 --target install 111 cmake --build build/simulator_arm64 -j 4 --target install
  112 +else
  113 + echo "Skip building for simulator (arm64)"
110 fi 114 fi
111 115
112 echo "Building for arm64" 116 echo "Building for arm64"
@@ -140,11 +144,149 @@ if [[ ! -f build/os64/install/lib/libsherpa-onnx-c-api.dylib ]]; then @@ -140,11 +144,149 @@ if [[ ! -f build/os64/install/lib/libsherpa-onnx-c-api.dylib ]]; then
140 -B build/os64 144 -B build/os64
141 145
142 cmake --build build/os64 -j 4 --target install 146 cmake --build build/os64 -j 4 --target install
  147 +else
  148 + echo "Skip building for arm64"
143 fi 149 fi
144 150
145 echo "Collect dynamic libraries " 151 echo "Collect dynamic libraries "
146 mkdir -p ios-arm64 ios-arm64-simulator ios-x86_64-simulator 152 mkdir -p ios-arm64 ios-arm64-simulator ios-x86_64-simulator
147 153
148 cp -v ./build/os64/install/lib/libsherpa-onnx-c-api.dylib ios-arm64/ 154 cp -v ./build/os64/install/lib/libsherpa-onnx-c-api.dylib ios-arm64/
149 -cp -v ./build/simulator_arm64/install/lib/libsherpa-onnx-c-api.dylib ios-arm64-simulator  
150 -cp -v .//build/simulator_x86_64/install/lib/libsherpa-onnx-c-api.dylib ios-x86_64-simulator 155 +cp -v ./build/simulator_arm64/install/lib/libsherpa-onnx-c-api.dylib ios-arm64-simulator/
  156 +cp -v .//build/simulator_x86_64/install/lib/libsherpa-onnx-c-api.dylib ios-x86_64-simulator/
  157 +
  158 +# see https://github.com/k2-fsa/sherpa-onnx/issues/1172#issuecomment-2439662662
  159 +rm -rf ios-arm64_x86_64-simulator
  160 +mkdir ios-arm64_x86_64-simulator
  161 +
  162 +lipo \
  163 + -create \
  164 + ios-arm64-simulator/libsherpa-onnx-c-api.dylib \
  165 + ios-x86_64-simulator/libsherpa-onnx-c-api.dylib \
  166 + -output \
  167 + ios-arm64_x86_64-simulator/libsherpa-onnx-c-api.dylib
  168 +
  169 +pushd ios-arm64
  170 +rm -rf sherpa_onnx.framework
  171 +mkdir sherpa_onnx.framework
  172 +
  173 +lipo \
  174 + -create \
  175 + libsherpa-onnx-c-api.dylib \
  176 + -output \
  177 + sherpa_onnx
  178 +
  179 +mv sherpa_onnx sherpa_onnx.framework/
  180 +cd sherpa_onnx.framework
  181 +
  182 +install_name_tool \
  183 + -change @rpath/libsherpa-onnx-c-api.dylib @rpath/sherpa_onnx.framework/sherpa_onnx \
  184 + sherpa_onnx
  185 +
  186 +install_name_tool \
  187 + -id "@rpath/sherpa_onnx.framework/sherpa_onnx" \
  188 + sherpa_onnx
  189 +
  190 +chmod +x sherpa_onnx
  191 +popd
  192 +
  193 +pushd ios-arm64_x86_64-simulator
  194 +rm -rf sherpa_onnx.framework
  195 +mkdir sherpa_onnx.framework
  196 +
  197 +lipo \
  198 + -create \
  199 + libsherpa-onnx-c-api.dylib \
  200 + -output \
  201 + sherpa_onnx
  202 +
  203 +mv sherpa_onnx sherpa_onnx.framework/
  204 +cd sherpa_onnx.framework
  205 +install_name_tool \
  206 + -change @rpath/libsherpa-onnx-c-api.dylib @rpath/sherpa_onnx.framework/sherpa_onnx \
  207 + sherpa_onnx
  208 +
  209 +install_name_tool \
  210 + -id "@rpath/sherpa_onnx.framework/sherpa_onnx" \
  211 + sherpa_onnx
  212 +
  213 +chmod +x sherpa_onnx
  214 +popd
  215 +
  216 +for d in ios-arm64_x86_64-simulator ios-arm64; do
  217 + dst=$d/sherpa_onnx.framework
  218 +
  219 + # The Info.plist is modified from
  220 + # https://github.com/Spicely/flutter_openim_sdk_ffi/blob/main/ios/openim_sdk_ffi.framework/Info.plist
  221 + cat >$dst/Info.plist <<EOF
  222 +<?xml version="1.0" encoding="UTF-8"?>
  223 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
  224 +<plist version="1.0">
  225 +<dict>
  226 + <key>CFBundleName</key>
  227 + <string>sherpa_onnx</string>
  228 + <key>DTSDKName</key>
  229 + <string>iphoneos17.0</string>
  230 + <key>DTXcode</key>
  231 + <string>1501</string>
  232 + <key>DTSDKBuild</key>
  233 + <string>21A326</string>
  234 + <key>CFBundleDevelopmentRegion</key>
  235 + <string>en</string>
  236 + <key>CFBundleVersion</key>
  237 + <string>1</string>
  238 + <key>BuildMachineOSBuild</key>
  239 + <string>23B81</string>
  240 + <key>DTPlatformName</key>
  241 + <string>iphoneos</string>
  242 + <key>CFBundlePackageType</key>
  243 + <string>FMWK</string>
  244 + <key>CFBundleShortVersionString</key>
  245 + <string>1.10.31</string>
  246 + <key>CFBundleSupportedPlatforms</key>
  247 + <array>
  248 + <string>iPhoneOS</string>
  249 + </array>
  250 + <key>CFBundleInfoDictionaryVersion</key>
  251 + <string>6.0</string>
  252 + <key>CFBundleExecutable</key>
  253 + <string>sherpa_onnx</string>
  254 + <key>DTCompiler</key>
  255 + <string>com.apple.compilers.llvm.clang.1_0</string>
  256 + <key>UIRequiredDeviceCapabilities</key>
  257 + <array>
  258 + <string>arm64</string>
  259 + </array>
  260 + <key>MinimumOSVersion</key>
  261 + <string>12.0</string>
  262 + <key>CFBundleIdentifier</key>
  263 + <string>com.k2fsa.sherpa.onnx</string>
  264 + <key>UIDeviceFamily</key>
  265 + <array>
  266 + <integer>1</integer>
  267 + <integer>2</integer>
  268 + </array>
  269 + <key>CFBundleSignature</key>
  270 + <string>????</string>
  271 + <key>DTPlatformVersion</key>
  272 + <string>17.0</string>
  273 + <key>DTXcodeBuild</key>
  274 + <string>15A507</string>
  275 + <key>DTPlatformBuild</key>
  276 + <string>21A326</string>
  277 +</dict>
  278 +</plist>
  279 +EOF
  280 +done
  281 +
  282 +rm -rf sherpa_onnx.xcframework
  283 +xcodebuild -create-xcframework \
  284 + -framework ios-arm64/sherpa_onnx.framework \
  285 + -framework ios-arm64_x86_64-simulator/sherpa_onnx.framework \
  286 + -output sherpa_onnx.xcframework
  287 +
  288 +cd sherpa_onnx.xcframework
  289 +echo "PWD: $PWD"
  290 +ls -lh
  291 +echo "---"
  292 +ls -lh */*
@@ -9,7 +9,7 @@ environment: @@ -9,7 +9,7 @@ environment:
9 sdk: ">=3.0.0 <4.0.0" 9 sdk: ">=3.0.0 <4.0.0"
10 10
11 dependencies: 11 dependencies:
12 - sherpa_onnx: ^1.10.30 12 + sherpa_onnx: ^1.10.31
13 path: ^1.9.0 13 path: ^1.9.0
14 args: ^2.5.0 14 args: ^2.5.0
15 15
@@ -9,7 +9,7 @@ environment: @@ -9,7 +9,7 @@ environment:
9 sdk: ">=3.0.0 <4.0.0" 9 sdk: ">=3.0.0 <4.0.0"
10 10
11 dependencies: 11 dependencies:
12 - sherpa_onnx: ^1.10.30 12 + sherpa_onnx: ^1.10.31
13 path: ^1.9.0 13 path: ^1.9.0
14 args: ^2.5.0 14 args: ^2.5.0
15 15
@@ -9,7 +9,7 @@ environment: @@ -9,7 +9,7 @@ environment:
9 sdk: ">=3.0.0 <4.0.0" 9 sdk: ">=3.0.0 <4.0.0"
10 10
11 dependencies: 11 dependencies:
12 - sherpa_onnx: ^1.10.30 12 + sherpa_onnx: ^1.10.31
13 # sherpa_onnx: 13 # sherpa_onnx:
14 # path: ../../flutter/sherpa_onnx 14 # path: ../../flutter/sherpa_onnx
15 path: ^1.9.0 15 path: ^1.9.0
@@ -10,7 +10,7 @@ environment: @@ -10,7 +10,7 @@ environment:
10 10
11 # Add regular dependencies here. 11 # Add regular dependencies here.
12 dependencies: 12 dependencies:
13 - sherpa_onnx: ^1.10.30 13 + sherpa_onnx: ^1.10.31
14 path: ^1.9.0 14 path: ^1.9.0
15 args: ^2.5.0 15 args: ^2.5.0
16 16
@@ -8,7 +8,7 @@ environment: @@ -8,7 +8,7 @@ environment:
8 sdk: ">=3.0.0 <4.0.0" 8 sdk: ">=3.0.0 <4.0.0"
9 9
10 dependencies: 10 dependencies:
11 - sherpa_onnx: ^1.10.30 11 + sherpa_onnx: ^1.10.31
12 # sherpa_onnx: 12 # sherpa_onnx:
13 # path: ../../flutter/sherpa_onnx 13 # path: ../../flutter/sherpa_onnx
14 path: ^1.9.0 14 path: ^1.9.0
@@ -9,7 +9,7 @@ environment: @@ -9,7 +9,7 @@ environment:
9 sdk: ">=3.0.0 <4.0.0" 9 sdk: ">=3.0.0 <4.0.0"
10 10
11 dependencies: 11 dependencies:
12 - sherpa_onnx: ^1.10.30 12 + sherpa_onnx: ^1.10.31
13 path: ^1.9.0 13 path: ^1.9.0
14 args: ^2.5.0 14 args: ^2.5.0
15 15
@@ -11,7 +11,7 @@ environment: @@ -11,7 +11,7 @@ environment:
11 11
12 # Add regular dependencies here. 12 # Add regular dependencies here.
13 dependencies: 13 dependencies:
14 - sherpa_onnx: ^1.10.30 14 + sherpa_onnx: ^1.10.31
15 path: ^1.9.0 15 path: ^1.9.0
16 args: ^2.5.0 16 args: ^2.5.0
17 17
@@ -8,7 +8,7 @@ environment: @@ -8,7 +8,7 @@ environment:
8 8
9 # Add regular dependencies here. 9 # Add regular dependencies here.
10 dependencies: 10 dependencies:
11 - sherpa_onnx: ^1.10.30 11 + sherpa_onnx: ^1.10.31
12 path: ^1.9.0 12 path: ^1.9.0
13 args: ^2.5.0 13 args: ^2.5.0
14 14
@@ -10,7 +10,7 @@ environment: @@ -10,7 +10,7 @@ environment:
10 sdk: ">=3.0.0 <4.0.0" 10 sdk: ">=3.0.0 <4.0.0"
11 11
12 dependencies: 12 dependencies:
13 - sherpa_onnx: ^1.10.30 13 + sherpa_onnx: ^1.10.31
14 path: ^1.9.0 14 path: ^1.9.0
15 args: ^2.5.0 15 args: ^2.5.0
16 16
@@ -9,7 +9,7 @@ environment: @@ -9,7 +9,7 @@ environment:
9 sdk: ">=3.0.0 <4.0.0" 9 sdk: ">=3.0.0 <4.0.0"
10 10
11 dependencies: 11 dependencies:
12 - sherpa_onnx: ^1.10.30 12 + sherpa_onnx: ^1.10.31
13 path: ^1.9.0 13 path: ^1.9.0
14 args: ^2.5.0 14 args: ^2.5.0
15 15
@@ -136,14 +136,16 @@ flutter create --platforms ios ./ @@ -136,14 +136,16 @@ flutter create --platforms ios ./
136 Connect your iPhone to the computer, and run `flutter devices`, which will print: 136 Connect your iPhone to the computer, and run `flutter devices`, which will print:
137 137
138 ```bash 138 ```bash
139 -Found 3 connected devices:  
140 - iPhone (mobile) • 00008030-001064212E85802E • ios • iOS 16.3 20D47  
141 - macOS (desktop) • macos • darwin-x64 • macOS 13.1 22C65 darwin-x64  
142 - Chrome (web) • chrome • web-javascript • Google Chrome 126.0.6478.127 139 +Found 4 connected devices:
  140 + iPhone 14 (mobile) • 634110C4-168D-408F-A938-D7FC62222579 • ios • com.apple.CoreSimulator.SimRuntime.iOS-16-2 (simulator)
  141 + iPhone (mobile) • 00008030-001064212E85802E • ios • iOS 16.3 20D47
  142 + macOS (desktop) • macos • darwin-x64 • macOS 13.1 22C65 darwin-x64
  143 + Chrome (web) • chrome • web-javascript • Google Chrome 126.0.6478.127
143 144
144 No wireless devices were found. 145 No wireless devices were found.
145 146
146 Run "flutter emulators" to list and start any available device emulators. 147 Run "flutter emulators" to list and start any available device emulators.
  148 +(E.g., flutter emulators --launch ios)
147 149
148 If you expected another device to be detected, please run "flutter doctor" to diagnose potential issues. You may also try increasing the time to wait 150 If you expected another device to be detected, please run "flutter doctor" to diagnose potential issues. You may also try increasing the time to wait
149 for connected devices with the "--device-timeout" flag. Visit https://flutter.dev/setup/ for troubleshooting tips. 151 for connected devices with the "--device-timeout" flag. Visit https://flutter.dev/setup/ for troubleshooting tips.
@@ -5,7 +5,7 @@ description: > @@ -5,7 +5,7 @@ description: >
5 5
6 publish_to: 'none' 6 publish_to: 'none'
7 7
8 -version: 1.10.30 8 +version: 1.10.31
9 9
10 topics: 10 topics:
11 - speech-recognition 11 - speech-recognition
@@ -31,7 +31,7 @@ dependencies: @@ -31,7 +31,7 @@ dependencies:
31 record: ^5.1.0 31 record: ^5.1.0
32 url_launcher: ^6.2.6 32 url_launcher: ^6.2.6
33 33
34 - sherpa_onnx: ^1.10.30 34 + sherpa_onnx: ^1.10.31
35 # sherpa_onnx: 35 # sherpa_onnx:
36 # path: ../../flutter/sherpa_onnx 36 # path: ../../flutter/sherpa_onnx
37 37
@@ -79,16 +79,17 @@ Future<sherpa_onnx.OfflineTts> createOfflineTts() async { @@ -79,16 +79,17 @@ Future<sherpa_onnx.OfflineTts> createOfflineTts() async {
79 // Example 7 79 // Example 7
80 // https://github.com/k2-fsa/sherpa-onnx/releases/tag/tts-models 80 // https://github.com/k2-fsa/sherpa-onnx/releases/tag/tts-models
81 // https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/vits-melo-tts-zh_en.tar.bz2 81 // https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/vits-melo-tts-zh_en.tar.bz2
82 - modelDir = 'vits-melo-tts-zh_en';  
83 - modelName = 'model.onnx';  
84 - lexicon = 'lexicon.txt';  
85 - dictDir = 'vits-melo-tts-zh_en/dict'; 82 + // modelDir = 'vits-melo-tts-zh_en';
  83 + // modelName = 'model.onnx';
  84 + // lexicon = 'lexicon.txt';
  85 + // dictDir = 'vits-melo-tts-zh_en/dict';
86 86
87 // ============================================================ 87 // ============================================================
88 // Please don't change the remaining part of this function 88 // Please don't change the remaining part of this function
89 // ============================================================ 89 // ============================================================
90 if (modelName == '') { 90 if (modelName == '') {
91 - throw Exception('You are supposed to select a model by changing the code before you run the app'); 91 + throw Exception(
  92 + 'You are supposed to select a model by changing the code before you run the app');
92 } 93 }
93 94
94 final Directory directory = await getApplicationDocumentsDirectory(); 95 final Directory directory = await getApplicationDocumentsDirectory();
@@ -5,7 +5,7 @@ description: > @@ -5,7 +5,7 @@ description: >
5 5
6 publish_to: 'none' # Remove this line if you wish to publish to pub.dev 6 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
7 7
8 -version: 1.10.30 8 +version: 1.10.31
9 9
10 environment: 10 environment:
11 sdk: ">=2.17.0 <4.0.0" 11 sdk: ">=2.17.0 <4.0.0"
@@ -18,7 +18,7 @@ dependencies: @@ -18,7 +18,7 @@ dependencies:
18 cupertino_icons: ^1.0.6 18 cupertino_icons: ^1.0.6
19 path_provider: ^2.1.3 19 path_provider: ^2.1.3
20 path: ^1.9.0 20 path: ^1.9.0
21 - sherpa_onnx: ^1.10.30 21 + sherpa_onnx: ^1.10.31
22 # sherpa_onnx: 22 # sherpa_onnx:
23 # path: ../../flutter/sherpa_onnx 23 # path: ../../flutter/sherpa_onnx
24 url_launcher: 6.2.6 24 url_launcher: 6.2.6
@@ -25,7 +25,7 @@ String? _path; @@ -25,7 +25,7 @@ String? _path;
25 // https://github.com/flutter/codelabs/blob/main/ffigen_codelab/step_05/lib/ffigen_app.dart 25 // https://github.com/flutter/codelabs/blob/main/ffigen_codelab/step_05/lib/ffigen_app.dart
26 // https://api.flutter.dev/flutter/dart-io/Platform-class.html 26 // https://api.flutter.dev/flutter/dart-io/Platform-class.html
27 final DynamicLibrary _dylib = () { 27 final DynamicLibrary _dylib = () {
28 - if (Platform.isMacOS || Platform.isIOS) { 28 + if (Platform.isMacOS) {
29 if (_path == null) { 29 if (_path == null) {
30 return DynamicLibrary.open('libsherpa-onnx-c-api.dylib'); 30 return DynamicLibrary.open('libsherpa-onnx-c-api.dylib');
31 } else { 31 } else {
@@ -33,6 +33,14 @@ final DynamicLibrary _dylib = () { @@ -33,6 +33,14 @@ final DynamicLibrary _dylib = () {
33 } 33 }
34 } 34 }
35 35
  36 + if (Platform.isIOS) {
  37 + if (_path == null) {
  38 + return DynamicLibrary.open('sherpa_onnx.framework/sherpa_onnx');
  39 + } else {
  40 + return DynamicLibrary.open('$_path/sherpa_onnx.framework/sherpa_onnx');
  41 + }
  42 + }
  43 +
36 if (Platform.isAndroid || Platform.isLinux) { 44 if (Platform.isAndroid || Platform.isLinux) {
37 if (_path == null) { 45 if (_path == null) {
38 return DynamicLibrary.open('libsherpa-onnx-c-api.so'); 46 return DynamicLibrary.open('libsherpa-onnx-c-api.so');
@@ -17,7 +17,7 @@ topics: @@ -17,7 +17,7 @@ topics:
17 - voice-activity-detection 17 - voice-activity-detection
18 18
19 # remember to change the version in ../sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec 19 # remember to change the version in ../sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec
20 -version: 1.10.30 20 +version: 1.10.31
21 21
22 homepage: https://github.com/k2-fsa/sherpa-onnx 22 homepage: https://github.com/k2-fsa/sherpa-onnx
23 23
@@ -30,23 +30,23 @@ dependencies: @@ -30,23 +30,23 @@ dependencies:
30 flutter: 30 flutter:
31 sdk: flutter 31 sdk: flutter
32 32
33 - sherpa_onnx_android: ^1.10.30 33 + sherpa_onnx_android: ^1.10.31
34 # sherpa_onnx_android: 34 # sherpa_onnx_android:
35 # path: ../sherpa_onnx_android 35 # path: ../sherpa_onnx_android
36 36
37 - sherpa_onnx_macos: ^1.10.30 37 + sherpa_onnx_macos: ^1.10.31
38 # sherpa_onnx_macos: 38 # sherpa_onnx_macos:
39 # path: ../sherpa_onnx_macos 39 # path: ../sherpa_onnx_macos
40 40
41 - sherpa_onnx_linux: ^1.10.30 41 + sherpa_onnx_linux: ^1.10.31
42 # sherpa_onnx_linux: 42 # sherpa_onnx_linux:
43 # path: ../sherpa_onnx_linux 43 # path: ../sherpa_onnx_linux
44 44
45 - sherpa_onnx_windows: ^1.10.30 45 + sherpa_onnx_windows: ^1.10.31
46 # sherpa_onnx_windows: 46 # sherpa_onnx_windows:
47 # path: ../sherpa_onnx_windows 47 # path: ../sherpa_onnx_windows
48 48
49 - sherpa_onnx_ios: ^1.10.30 49 + sherpa_onnx_ios: ^1.10.31
50 # sherpa_onnx_ios: 50 # sherpa_onnx_ios:
51 # path: ../sherpa_onnx_ios 51 # path: ../sherpa_onnx_ios
52 52
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 # https://groups.google.com/g/dart-ffi/c/nUATMBy7r0c 7 # https://groups.google.com/g/dart-ffi/c/nUATMBy7r0c
8 Pod::Spec.new do |s| 8 Pod::Spec.new do |s|
9 s.name = 'sherpa_onnx_ios' 9 s.name = 'sherpa_onnx_ios'
10 - s.version = '1.10.30' 10 + s.version = '1.10.31'
11 s.summary = 'A new Flutter FFI plugin project.' 11 s.summary = 'A new Flutter FFI plugin project.'
12 s.description = <<-DESC 12 s.description = <<-DESC
13 A new Flutter FFI plugin project. 13 A new Flutter FFI plugin project.
@@ -23,7 +23,8 @@ A new Flutter FFI plugin project. @@ -23,7 +23,8 @@ A new Flutter FFI plugin project.
23 s.source = { :path => '.' } 23 s.source = { :path => '.' }
24 s.dependency 'Flutter' 24 s.dependency 'Flutter'
25 s.platform = :ios, '12.0' 25 s.platform = :ios, '12.0'
26 - s.ios.vendored_libraries = '*.dylib', '*.a' 26 + s.preserve_paths = 'sherpa_onnx.xcframework/**/*'
  27 + s.vendored_frameworks = 'sherpa_onnx.xcframework'
27 28
28 # Flutter.framework does not contain a i386 slice. 29 # Flutter.framework does not contain a i386 slice.
29 s.pod_target_xcconfig = { 30 s.pod_target_xcconfig = {
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 # 4 #
5 Pod::Spec.new do |s| 5 Pod::Spec.new do |s|
6 s.name = 'sherpa_onnx_macos' 6 s.name = 'sherpa_onnx_macos'
7 - s.version = '1.10.30' 7 + s.version = '1.10.31'
8 s.summary = 'sherpa-onnx Flutter FFI plugin project.' 8 s.summary = 'sherpa-onnx Flutter FFI plugin project.'
9 s.description = <<-DESC 9 s.description = <<-DESC
10 sherpa-onnx Flutter FFI plugin project. 10 sherpa-onnx Flutter FFI plugin project.
1 #!/usr/bin/env bash 1 #!/usr/bin/env bash
2 2
3 -find flutter -name *.yaml -type f -exec sed -i.bak 's/1\.10\.29/1\.10\.30/g' {} \;  
4 -find dart-api-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.29/1\.10\.30/g' {} \;  
5 -find flutter-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.29/1\.10\.30/g' {} \;  
6 -find flutter -name *.podspec -type f -exec sed -i.bak 's/1\.10\.29/1\.10\.30/g' {} \;  
7 -find nodejs-addon-examples -name package.json -type f -exec sed -i.bak 's/1\.10\.29/1\.10\.30/g' {} \; 3 +sed -i.bak 's/1\.10\.30/1\.10\.31/g' ./build-ios-shared.sh
  4 +find flutter -name *.yaml -type f -exec sed -i.bak 's/1\.10\.30/1\.10\.31/g' {} \;
  5 +find dart-api-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.30/1\.10\.31/g' {} \;
  6 +find flutter-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.30/1\.10\.31/g' {} \;
  7 +find flutter -name *.podspec -type f -exec sed -i.bak 's/1\.10\.30/1\.10\.31/g' {} \;
  8 +find nodejs-addon-examples -name package.json -type f -exec sed -i.bak 's/1\.10\.30/1\.10\.31/g' {} \;
1 { 1 {
2 "dependencies": { 2 "dependencies": {
3 - "sherpa-onnx-node": "^1.10.30" 3 + "sherpa-onnx-node": "^1.10.31"
4 } 4 }
5 } 5 }