react-native-lingua 0.2.0 → 0.2.1

package/Lingua.podspec

@@ -15,54 +15,19 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm}", "cpp/**/*.{hpp,cpp,c,h}"
   s.private_header_files = "ios/**/*.h"
-  s.vendored_frameworks = "ios/*.xcframework"
 
-  # Build Rust library from source during pod install
-  s.prepare_command = <<-CMD
-    set -e
-    
-    # Check if Rust is installed
-    if ! command -v cargo &> /dev/null; then
-      echo "[ERROR] Rust is not installed."
-      echo "Please install Rust: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh"
-      exit 1
-    fi
-    
-    # Check if iOS targets are installed
-    if ! rustup target list --installed | grep -q "aarch64-apple-ios"; then
-      echo "[ERROR] iOS Rust targets not installed."
-      echo "Please run: rustup target add aarch64-apple-ios aarch64-apple-ios-sim"
-      exit 1
-    fi
-    
-    # Clean previous builds
-    rm -rf rust/generated/liblingua_native.xcframework
-    rm -rf ios/liblingua_native.xcframework
-    
-    # Build the xcframework
-    cd rust
-    make header
-    
-    # Build for iOS targets
-    echo "[INFO] Building Rust library for iOS..."
-    cargo build --release --target aarch64-apple-ios
-    cargo build --release --target aarch64-apple-ios-sim
-    
-    # Create xcframework
-    mkdir -p generated/include
-    xcodebuild -create-xcframework \
-      -library target/aarch64-apple-ios/release/liblingua_native.a \
-      -headers generated/include \
-      -library target/aarch64-apple-ios-sim/release/liblingua_native.a \
-      -headers generated/include \
-      -output generated/liblingua_native.xcframework
-    
-    # Copy to ios directory
-    cp -rf generated/liblingua_native.xcframework ../ios/
-    cp -f generated/include/liblingua.h ../cpp/
-    
-    echo "[SUCCESS] Rust library built successfully"
-  CMD
+  s.pod_target_xcconfig = {
+    'LIBRARY_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)/ios/build"',
+    'OTHER_LDFLAGS' => '-llingua_native'
+  }
+
+  s.script_phase = {
+    :name => 'Build Rust Library',
+    :script => 'bash "${PODS_TARGET_SRCROOT}/ios/build.sh"',
+    :execution_position => :before_compile,
+    :input_files => ['${PODS_TARGET_SRCROOT}/rust/src/**/*.rs', '${PODS_TARGET_SRCROOT}/rust/Cargo.toml'],
+    :output_files => ['${PODS_TARGET_SRCROOT}/ios/build/liblingua_native.a', '${PODS_TARGET_SRCROOT}/cpp/liblingua.h']
+  }
 
   install_modules_dependencies(s)
 end

package/README.md

@@ -48,7 +48,7 @@ npm install react-native-lingua
 yarn add react-native-lingua
 ```
 
-The native libraries will be built automatically during `postinstall`.
+The native libraries will be built automatically during the native build process (Xcode/Gradle).
 
 ### iOS Setup
 

package/android/build.gradle

@@ -98,10 +98,7 @@ task buildRust(type: Exec) {
   workingDir file("${projectDir}/../rust")
   commandLine 'make', 'android'
 
-  // Only run if jniLibs don't exist
-  onlyIf {
-    !file("${projectDir}/jniLibs/arm64-v8a/liblingua_native.a").exists()
-  }
+
 
   dependsOn buildRustHeader
 }

package/android/src/main/jni/include/liblingua.h

@@ -21,7 +21,7 @@ struct ConfidenceValue {
 
 extern "C" {
 
-void set_error(const char **err, const str *error_message);
+void set_error(const char **err, const char *error_message);
 
 const char *get_error();
 

package/ios/build.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+set -e
+
+# Setup path to rust/cargo
+# Xcode doesn't load .zshrc/.bashrc, so we need to find cargo manually if not in PATH
+export PATH="$HOME/.cargo/bin:$PATH"
+
+if ! command -v cargo &> /dev/null; then
+    echo "error: Rust not found. Please install Rust: https://rustup.rs"
+    exit 1
+fi
+
+# Move to rust directory
+TOOLS_DIR=$(cd "$(dirname "$0")/../rust" && pwd)
+cd "$TOOLS_DIR"
+
+echo "Building Rust library for ARCHS=$ARCHS PLATFORM_NAME=$PLATFORM_NAME"
+
+LIBS=()
+
+for ARCH in $ARCHS; do
+    TARGET=""
+    if [ "$PLATFORM_NAME" == "iphoneos" ]; then
+        if [ "$ARCH" == "arm64" ]; then
+            TARGET="aarch64-apple-ios"
+        fi
+    elif [ "$PLATFORM_NAME" == "iphonesimulator" ]; then
+        if [ "$ARCH" == "arm64" ]; then
+            TARGET="aarch64-apple-ios-sim"
+        elif [ "$ARCH" == "x86_64" ]; then
+            TARGET="x86_64-apple-ios"
+        fi
+    fi
+
+    if [ -z "$TARGET" ]; then
+        echo "warning: Unknown arch $ARCH for platform $PLATFORM_NAME, skipping"
+        continue
+    fi
+
+    echo "Building for $TARGET"
+    # Ensure target is added
+    rustup target add "$TARGET"
+
+    cargo build --release --target "$TARGET" --lib
+    LIBS+=("target/$TARGET/release/liblingua_native.a")
+done
+
+# Ensure header is generated and copied
+HEADER_PATH="generated/include/liblingua.h"
+# If header doesn't exist (maybe built fresh), force generation
+if [ ! -f "$HEADER_PATH" ]; then
+    echo "Header generated/include/liblingua.h missing, forcing generation..."
+    mkdir -p generated/include
+    # Force build.rs to run by updating mtime of main source
+    touch src/lib.rs
+    cargo build --lib
+fi
+
+echo "Copying header to cpp/"
+cp -f "$HEADER_PATH" "../cpp/liblingua.h"
+
+# Link with Lipo
+mkdir -p "../ios/build"
+OUTPUT_LIB="../ios/build/liblingua_native.a"
+rm -f "$OUTPUT_LIB"
+
+if [ ${#LIBS[@]} -eq 0 ]; then
+    echo "error: No libraries built for ARCHS=$ARCHS"
+    exit 1
+fi
+
+echo "Creating universal library at $OUTPUT_LIB from ${LIBS[@]}"
+lipo -create "${LIBS[@]}" -output "$OUTPUT_LIB"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-lingua",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A lingua-rs wrapper for React Native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -17,6 +17,7 @@
     "lib",
     "android",
     "ios/*.{h,mm}",
+    "ios/build.sh",
     "cpp",
     "rust/src",
     "rust/Cargo.toml",
@@ -31,6 +32,7 @@
     "!android/gradlew",
     "!android/gradlew.bat",
     "!android/local.properties",
+    "!android/jniLibs",
     "!cpp/liblingua.h",
     "!**/__tests__",
     "!**/__fixtures__",
@@ -39,16 +41,6 @@
     "README.md",
     "LICENSE"
   ],
-  "scripts": {
-    "example": "pnpm --filter react-native-lingua-example",
-    "test": "jest",
-    "typecheck": "tsc",
-    "lint": "eslint \"**/*.{js,ts,tsx}\"",
-    "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
-    "build:rust": "cd rust && make all",
-    "prepare": "bob build",
-    "release": "release-it --only-version"
-  },
   "workspaces": [
     "example"
   ],
@@ -97,7 +89,6 @@
     "react": "*",
     "react-native": "*"
   },
-  "packageManager": "pnpm@10.14.0",
   "jest": {
     "preset": "react-native",
     "modulePathIgnorePatterns": [
@@ -169,5 +160,14 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.28.4"
+  },
+  "scripts": {
+    "example": "pnpm --filter react-native-lingua-example",
+    "test": "jest",
+    "typecheck": "tsc",
+    "lint": "eslint \"**/*.{js,ts,tsx}\"",
+    "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
+    "build:rust": "cd rust && make all",
+    "release": "release-it --only-version"
   }
-}
+}