react-native-sherpa-onnx 0.3.2 → 0.3.4

package/android/prebuilt-versions.gradle

@@ -11,33 +11,41 @@ def readVersionFromTagFile(File tagFile, String prefix) {
   return null
 }
 
+// Module root: parent of android/ (so tag files resolve when SDK is used as dependency, e.g. node_modules/react-native-sherpa-onnx).
+def moduleRoot = project.projectDir.parentFile
+
 // sherpa-onnx: 1. SHERPA_ONNX_VERSION env 2. ANDROID_RELEASE_TAG 3. property 4. default
 def sherpaOnnxVersion = System.getenv('SHERPA_ONNX_VERSION')
 if (!sherpaOnnxVersion) {
-  def v = readVersionFromTagFile(new File(rootDir, 'third_party/sherpa-onnx-prebuilt/ANDROID_RELEASE_TAG'), 'sherpa-onnx-android-v')
-  sherpaOnnxVersion = v ?: (project.hasProperty('sherpaOnnxVersion') ? project.sherpaOnnxVersion : '1.12.24')
+  def v = readVersionFromTagFile(new File(moduleRoot, 'third_party/sherpa-onnx-prebuilt/ANDROID_RELEASE_TAG'), 'sherpa-onnx-android-v')
+  sherpaOnnxVersion = v ?: (project.hasProperty('sherpaOnnxVersion') ? project.sherpaOnnxVersion : '1.12.28')
 }
 project.ext.sherpaOnnxVersion = sherpaOnnxVersion
+println "[react-native-sherpa-onnx] sherpa-onnx version (extracted/used): ${sherpaOnnxVersion}"
 
 // FFmpeg: 1. FFMPEG_VERSION env 2. ANDROID_RELEASE_TAG 3. property 4. default
 def ffmpegVersion = System.getenv('FFMPEG_VERSION')
 if (!ffmpegVersion) {
-  def v = readVersionFromTagFile(new File(rootDir, 'third_party/ffmpeg_prebuilt/ANDROID_RELEASE_TAG'), 'ffmpeg-android-v')
+  def v = readVersionFromTagFile(new File(moduleRoot, 'third_party/ffmpeg_prebuilt/ANDROID_RELEASE_TAG'), 'ffmpeg-android-v')
   ffmpegVersion = v ?: (project.hasProperty('ffmpegVersion') ? project.ffmpegVersion : '8.0.1')
 }
 project.ext.ffmpegVersion = ffmpegVersion
+println "[react-native-sherpa-onnx] ffmpeg version (extracted/used): ${ffmpegVersion}"
 
 // libarchive: 1. LIBARCHIVE_VERSION env 2. ANDROID_RELEASE_TAG 3. property 4. default
 def libarchiveVersion = System.getenv('LIBARCHIVE_VERSION')
 if (!libarchiveVersion) {
-  def v = readVersionFromTagFile(new File(rootDir, 'third_party/libarchive_prebuilt/ANDROID_RELEASE_TAG'), 'libarchive-android-v')
+  def v = readVersionFromTagFile(new File(moduleRoot, 'third_party/libarchive_prebuilt/ANDROID_RELEASE_TAG'), 'libarchive-android-v')
   libarchiveVersion = v ?: (project.hasProperty('libarchiveVersion') ? project.libarchiveVersion : '3.8.5')
 }
 project.ext.libarchiveVersion = libarchiveVersion
+println "[react-native-sherpa-onnx] libarchive version (extracted/used): ${libarchiveVersion}"
 
-// onnxruntime (ORT Java bridge): 1. ORT_VERSION env 2. property 3. default
+// onnxruntime (ORT Java bridge): 1. ORT_VERSION env 2. ANDROID_RELEASE_TAG 3. property 4. default
 def ortVersion = System.getenv('ORT_VERSION')
 if (!ortVersion) {
-  ortVersion = project.hasProperty('ortVersion') ? project.ortVersion : '1.24.2-qnn2.43.1.260218'
+  def v = readVersionFromTagFile(new File(moduleRoot, 'third_party/onnxruntime_prebuilt/ANDROID_RELEASE_TAG'), 'ort-android-qnn-v')
+  ortVersion = v ?: (project.hasProperty('ortVersion') ? project.ortVersion : '1.24.2-qnn2.43.1.260218')
 }
 project.ext.ortVersion = ortVersion
+println "[react-native-sherpa-onnx] onnxruntime version (extracted/used): ${ortVersion}"

package/android/src/main/cpp/CMakeLists.txt

@@ -76,6 +76,8 @@ set(SOURCES
     jni/model_detect/sherpa-onnx-model-detect-helper.cpp
     jni/model_detect/sherpa-onnx-model-detect-stt.cpp
     jni/model_detect/sherpa-onnx-model-detect-tts.cpp
+    jni/model_detect/sherpa-onnx-validate-stt.cpp
+    jni/model_detect/sherpa-onnx-validate-tts.cpp
     jni/model_detect/sherpa-onnx-detect-jni-common.cpp
     jni/model_detect/sherpa-onnx-stt-wrapper.cpp
     jni/model_detect/sherpa-onnx-tts-wrapper.cpp