react-native-sherpa-onnx 0.3.0 → 0.3.1

package/android/build.gradle

@@ -1,5 +1,5 @@
 // Prebuilt versions (sherpa-onnx, FFmpeg, libarchive) from prebuilt-versions.gradle.
-// Resolution: env → ANDROID_RELEASE_TAG files → project property → default.
+// Resolution: env --> ANDROID_RELEASE_TAG files --> project property --> default.
 apply from: file("${project.projectDir}/prebuilt-versions.gradle")
 
 // Used by dependencies below and by prebuilt-download.gradle (extractSherpaOnnxClasses, downloadNativeLibsIfNeeded).
@@ -39,13 +39,7 @@ buildscript {
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
-
-// Standalone AAR build: set in root build.gradle (ext.standaloneAarBuild = true) or via -PstandaloneAarBuild=true
-def isStandaloneAarBuild = rootProject.findProperty("standaloneAarBuild") in [true, "true"]
-// Only apply React Native plugin when building inside a React Native app (e.g. example app).
-if (!isStandaloneAarBuild) {
-  apply plugin: "com.facebook.react"
-}
+apply plugin: "com.facebook.react"
 
 android {
   namespace "com.sherpaonnx"
@@ -55,10 +49,6 @@ android {
   // Native .so and headers: filled by prebuilt-download.gradle (local jniLibs, Maven AAR, or GitHub release).
   // Alternatively by third_party/*/copy_prebuilts_to_sdk.js or shipped in npm package.
 
-  // Codegen Java output: always use the flat path. For app builds RNGP writes here directly;
-  // for standalone AAR builds the codegen task normalises the nested output to this path.
-  sourceSets.main.java.srcDirs += file("${buildDir}/generated/source/codegen/java")
-
   defaultConfig {
     minSdkVersion getExtOrDefault("minSdkVersion")
     targetSdkVersion getExtOrDefault("targetSdkVersion")
@@ -119,7 +109,7 @@ repositories {
   maven { url "https://xdcobra.github.io/maven" }
 }
 
-// Configurations used by prebuilt-download.gradle: downloadNativeLibsIfNeeded (AAR → jniLibs + headers),
+// Configurations used by prebuilt-download.gradle: downloadNativeLibsIfNeeded (AAR --> jniLibs + headers),
 // extractSherpaOnnxClasses (sherpa-onnx classes.jar), extractOnnxruntimeClasses (onnxruntime classes.jar).
 configurations { sherpaOnnxAar; ffmpegAar; libarchiveAar; onnxruntimeAar }
 
@@ -129,8 +119,7 @@ apply from: file("${project.projectDir}/prebuilt-download.gradle")
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-  // React Native dependency: explicit version ensures IDE (VS Code Kotlin LSP) and standalone
-  // AAR builds can resolve com.facebook.react types. When consumed by a React Native app,
+  // React Native dependency: explicit version for IDE (VS Code Kotlin LSP). When consumed by a React Native app,
   // Gradle's dependency resolution picks the app's react-android version (typically higher).
   implementation "com.facebook.react:react-android:0.83.0"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
@@ -155,13 +144,10 @@ dependencies {
   implementation "com.google.android.play:asset-delivery:2.3.0"
 }
 
-// TurboModule codegen; separate script to avoid Gradle 9 Groovy "source is null" with NodeTask.
-apply from: file("${project.projectDir}/codegen.gradle")
-
-// Wire prebuilt tasks: extractSherpaOnnxClasses → downloadNativeLibsIfNeeded when not standalone;
+// Wire prebuilt tasks: extractSherpaOnnxClasses --> downloadNativeLibsIfNeeded;
 // CMake/compile tasks depend on extractSherpaOnnxClasses and checkJniLibs.
 afterEvaluate {
-  if (!isStandaloneAarBuild && tasks.findByName("downloadNativeLibsIfNeeded") != null) {
+  if (tasks.findByName("downloadNativeLibsIfNeeded") != null) {
     tasks.named("extractSherpaOnnxClasses").configure { dependsOn tasks.named("downloadNativeLibsIfNeeded") }
     tasks.named("extractOnnxruntimeClasses").configure { dependsOn tasks.named("downloadNativeLibsIfNeeded") }
   }
@@ -170,14 +156,8 @@ afterEvaluate {
     dependsOn tasks.named("extractOnnxruntimeClasses")
     dependsOn tasks.named("checkJniLibs")
   }
-
-  // With includesGeneratedCode=false, codegen is always run by our custom task (not RNGP).
-  // Kotlin compile must depend on it for both standalone AAR and app-dependency builds.
-  def codegenJavaDir = project.file("${project.buildDir}/generated/source/codegen/java")
   tasks.matching { it.name == "compileReleaseKotlin" || it.name == "compileDebugKotlin" }.configureEach {
     dependsOn tasks.named("extractSherpaOnnxClasses")
     dependsOn tasks.named("extractOnnxruntimeClasses")
-    dependsOn tasks.named('generateCodegenSpec')
-    inputs.dir(codegenJavaDir)
   }
 }

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

@@ -105,7 +105,7 @@ add_library(sherpaonnx SHARED
 # sherpa-onnx C-API: link by directory + library name only (no IMPORTED target).
 # The .so and headers land in jniLibs and cpp/include/sherpa-onnx via:
 #   (1) local third_party build, (2) Maven AAR extraction (libs + c-api headers), or (3) GitHub release zip (last resort).
-# If we used IMPORTED here, AGP would also copy .so from CMake → duplicate in mergeNativeLibs.
+# If we used IMPORTED here, AGP would also copy .so from CMake --> duplicate in mergeNativeLibs.
 set(SHERPA_ONNX_PREBUILT_BASE "${PROJECT_ROOT}/../third_party/sherpa-onnx-prebuilt/android")
 set(SHERPA_ONNX_ABI_LIB "${SHERPA_ONNX_PREBUILT_BASE}/${ANDROID_ABI}/lib")
 set(SHERPA_C_API_LIB_DIR "")

package/android/src/main/java/com/sherpaonnx/SherpaOnnxModule.kt

@@ -7,7 +7,6 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.facebook.fbreact.specs.NativeSherpaOnnxSpec
 
 @ReactModule(name = SherpaOnnxModule.NAME)
 class SherpaOnnxModule(reactContext: ReactApplicationContext) :

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-sherpa-onnx",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Offline Speech-to-text, text-to-speech, speaker diarization, speech enhancement, source separation, and VAD with sherpa-onnx for React NativeSpeech-to-Text with sherpa-onnx for React Native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -185,7 +185,6 @@
     "name": "SherpaOnnxSpec",
     "type": "modules",
     "jsSrcsDir": "src",
-    "includesGeneratedCode": false,
     "android": {
       "javaPackageName": "com.sherpaonnx"
     }

package/android/codegen.gradle

@@ -1,57 +0,0 @@
-// With includesGeneratedCode=false, RNGP does not run codegen for this library when it
-// is built as a dependency (e.g. example app). Run codegen whenever this module is built
-// (standalone AAR or as part of an app) so that NativeSherpaOnnxSpec exists for Kotlin compile.
-// Uses Exec + node (no Node Gradle plugin) to avoid classloader/DSL issues in applied script.
-def libraryRoot = project.projectDir.parentFile
-def outDir = file("${project.buildDir}/generated/source/codegen")
-def codegenJavaDir = file("${project.buildDir}/generated/source/codegen/java")
-
-codegenJavaDir.mkdirs()
-
-def codegenScript = file("${libraryRoot}/node_modules/react-native/scripts/generate-codegen-artifacts.js")
-def outDirPath = outDir.absolutePath.replace("\\", "/")
-def libraryRootPath = libraryRoot.absolutePath.replace("\\", "/")
-
-tasks.register("generateCodegenSpecNode", Exec) {
-  onlyIf { !project.hasProperty('useNpx') || project.property('useNpx') != 'true' }
-  workingDir = libraryRoot
-  inputs.dir(file("${libraryRoot}/src"))
-  inputs.file(file("${libraryRoot}/package.json"))
-  outputs.dir(codegenJavaDir)
-
-  doFirst {
-    if (!file("${libraryRoot}/node_modules/react-native").exists()) {
-      throw new RuntimeException(
-        "Codegen requires node_modules at library root. Run 'yarn install' (or npm install) in ${libraryRoot}, then rebuild."
-      )
-    }
-    outDir.mkdirs()
-  }
-
-  commandLine(
-    'node',
-    codegenScript.absolutePath,
-    '-p', libraryRootPath,
-    '-t', 'android',
-    '-o', outDirPath,
-    '-s', 'library'
-  )
-  environment 'CI': 'true'
-
-  doLast {
-    def nestedJava = file("${outDir}/android/app/build/generated/source/codegen/java")
-    if (nestedJava.exists()) {
-      project.copy {
-        from nestedJava
-        into codegenJavaDir
-      }
-      println "[codegen] Normalised spec output -> ${codegenJavaDir}"
-    } else {
-      println "[codegen] WARNING: expected nested output at ${nestedJava} not found"
-    }
-  }
-}
-
-tasks.register('generateCodegenSpec') {
-  dependsOn tasks.named('generateCodegenSpecNode')
-}