simplejsble 0.0.38 → 0.0.40

package/NitroSimplejsble.podspec

@@ -11,8 +11,7 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
 
   s.ios.deployment_target = '15.8'
-  s.osx.deployment_target = '13.0'
-
+  s.macos.deployment_target = '13.0'
 
   s.source = { :path => "." }
 

package/apple/SimpleBLE.xcframework/Info.plist

@@ -28,16 +28,15 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libsimpleble.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -45,15 +44,16 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libsimpleble.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>macos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simplejsble",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "description": "React Native Bluetooth Low Energy library using SimpleBLE with Nitro Modules",
   "main": "lib/index",
   "module": "lib/index",
@@ -14,6 +14,7 @@
     "android/",
     "apple/",
     "cpp/",
+    "scripts/",
     "simpleble/",
     "simpledroidbridge/",
     "cmake/",
@@ -26,6 +27,7 @@
     "README.md"
   ],
   "scripts": {
+    "postinstall": "bash scripts/patch-nitro-modules.sh",
     "prepack": "npm run build && npx nitrogen && bash scripts/prepare-package.sh",
     "typecheck": "tsc --noEmit",
     "build": "tsc",
@@ -62,6 +64,9 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
+  "dependencies": {
+    "react-native-nitro-modules": ">=0.20.0"
+  },
   "devDependencies": {
     "@react-native/eslint-config": "0.82.0",
     "@types/react": "^19.1.03",
@@ -77,13 +82,7 @@
   },
   "peerDependencies": {
     "react": "*",
-    "react-native": "*",
-    "react-native-nitro-modules": ">=0.20.0"
-  },
-  "peerDependenciesMeta": {
-    "react-native-nitro-modules": {
-      "optional": false
-    }
+    "react-native": "*"
   },
   "eslintConfig": {
     "root": true,

package/scripts/patch-nitro-modules.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+#
+# Patches NitroModules.podspec to use standard CocoaPods deployment_target syntax.
+#
+# Problem: react-native-nitro-modules uses non-standard `s.platforms = {...}` syntax
+# which doesn't properly propagate deployment targets, causing build errors like:
+# "Property with 'retain (or strong)' attribute must be of object type"
+#
+# Solution: Replace with standard `s.ios.deployment_target = ...` syntax.
+#
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SCRIPT_NAME="[simplejsble]"
+
+# Possible locations for NitroModules.podspec
+PATHS=(
+  "$SCRIPT_DIR/../../../react-native-nitro-modules/NitroModules.podspec"
+  "$SCRIPT_DIR/../../../../node_modules/react-native-nitro-modules/NitroModules.podspec"
+)
+
+PODSPEC_PATH=""
+for path in "${PATHS[@]}"; do
+  if [ -f "$path" ]; then
+    PODSPEC_PATH="$path"
+    break
+  fi
+done
+
+if [ -z "$PODSPEC_PATH" ]; then
+  echo "$SCRIPT_NAME NitroModules.podspec not found, skipping patch"
+  exit 0
+fi
+
+# Check if already patched
+if grep -q "s\.ios\.deployment_target" "$PODSPEC_PATH" || grep -q "s\.macos\.deployment_target" "$PODSPEC_PATH"; then
+  echo "$SCRIPT_NAME NitroModules.podspec already using standard syntax"
+  exit 0
+fi
+
+# Check if has the old syntax
+if ! grep -q "s\.platforms" "$PODSPEC_PATH"; then
+  echo "$SCRIPT_NAME NitroModules.podspec format not recognized, skipping patch"
+  exit 0
+fi
+
+# Create the replacement
+NEW_SYNTAX="s.ios.deployment_target = min_ios_version_supported
+  s.macos.deployment_target = '13.0'
+  s.tvos.deployment_target = '13.4'
+  s.visionos.deployment_target = '1.0'"
+
+# Use sed to replace the s.platforms = {...} block
+# This handles multiline replacement
+sed -i.bak '/s\.platforms.*=.*{/,/}/c\
+  s.ios.deployment_target = min_ios_version_supported\
+  s.macos.deployment_target = '"'"'13.0'"'"'\
+  s.tvos.deployment_target = '"'"'13.4'"'"'\
+  s.visionos.deployment_target = '"'"'1.0'"'"'' "$PODSPEC_PATH"
+
+# Remove backup file
+rm -f "${PODSPEC_PATH}.bak"
+
+echo "$SCRIPT_NAME ✓ Patched NitroModules.podspec deployment targets"

package/scripts/prepare-package.sh

@@ -0,0 +1,190 @@
+#!/bin/bash
+set -e
+
+# Get script directory and calculate paths
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PACKAGE_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
+REPO_ROOT="$(cd "${PACKAGE_DIR}/../../.." && pwd)"
+APPLE_DIR="${PACKAGE_DIR}/apple"
+
+# Deployment targets
+IOS_DEPLOYMENT_TARGET="${IOS_DEPLOYMENT_TARGET:-13.4}"
+MACOS_DEPLOYMENT_TARGET="${MACOS_DEPLOYMENT_TARGET:-10.13}"
+
+# Directories to clean before packing (native build artifacts only, not lib/)
+DIRS_TO_CLEAN=(
+  "android/build"
+  "android/.cxx"
+  "android/.gradle"
+  "apple/build"
+)
+
+# Directories/files to copy from repo root
+ITEMS_TO_COPY=(
+  "simpleble"
+  "simpledroidbridge"
+  "cmake"
+  "dependencies"
+  "VERSION"
+)
+
+echo "Preparing package for npm publish..."
+echo "Package dir: ${PACKAGE_DIR}"
+echo "Repo root: ${REPO_ROOT}"
+
+# Clean build artifacts first
+echo ""
+echo "Cleaning build artifacts..."
+for dir in "${DIRS_TO_CLEAN[@]}"; do
+  dir_path="${PACKAGE_DIR}/${dir}"
+  if [ -d "${dir_path}" ]; then
+    rm -rf "${dir_path}"
+    echo "✓ Cleaned: ${dir}"
+  fi
+done
+echo ""
+
+# Copy items from repo root
+for item in "${ITEMS_TO_COPY[@]}"; do
+  src="${REPO_ROOT}/${item}"
+  dest="${PACKAGE_DIR}/${item}"
+
+  if [ ! -e "${src}" ]; then
+    echo "Warning: ${src} does not exist, skipping..."
+    continue
+  fi
+
+  # Remove existing copy if it exists
+  if [ -e "${dest}" ]; then
+    rm -rf "${dest}"
+  fi
+
+  # Copy directory or file
+  if [ -d "${src}" ]; then
+    cp -R "${src}" "${dest}"
+    echo "✓ Copied directory: ${item}"
+  else
+    cp "${src}" "${dest}"
+    echo "✓ Copied file: ${item}"
+  fi
+done
+
+# =============================================================================
+# Build SimpleBLE XCFramework for iOS and macOS
+# =============================================================================
+
+echo ""
+echo "Building SimpleBLE XCFramework..."
+echo "iOS deployment target: ${IOS_DEPLOYMENT_TARGET}"
+echo "macOS deployment target: ${MACOS_DEPLOYMENT_TARGET}"
+
+# Build for iOS platforms (iphoneos, iphonesimulator)
+build_for_ios_platform() {
+    local PLATFORM=$1  # iphoneos or iphonesimulator
+    local ARCH=$2      # arm64 or x86_64
+
+    local BUILD_DIR="${APPLE_DIR}/build_${PLATFORM}_${ARCH}"
+    local INSTALL_DIR="${APPLE_DIR}/simpleble_${PLATFORM}_${ARCH}"
+
+    echo ""
+    echo "Building SimpleBLE for ${PLATFORM} (${ARCH})..."
+
+    cmake -B "${BUILD_DIR}" -S "${APPLE_DIR}" \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_SYSTEM_NAME=iOS \
+        -DCMAKE_OSX_SYSROOT="${PLATFORM}" \
+        -DCMAKE_OSX_ARCHITECTURES="${ARCH}" \
+        -DCMAKE_OSX_DEPLOYMENT_TARGET="${IOS_DEPLOYMENT_TARGET}" \
+        -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
+        -DBUILD_SHARED_LIBS=OFF \
+        -DSIMPLEBLE_EXCLUDE_C=ON
+
+    cmake --build "${BUILD_DIR}" --config Release --parallel
+    cmake --install "${BUILD_DIR}" --config Release
+
+    echo "Installed to ${INSTALL_DIR}"
+}
+
+# Build for macOS platforms
+build_for_macos_platform() {
+    local ARCH=$1  # arm64 or x86_64
+
+    local BUILD_DIR="${APPLE_DIR}/build_macosx_${ARCH}"
+    local INSTALL_DIR="${APPLE_DIR}/simpleble_macosx_${ARCH}"
+
+    echo ""
+    echo "Building SimpleBLE for macOS (${ARCH})..."
+
+    cmake -B "${BUILD_DIR}" -S "${APPLE_DIR}" \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_SYSTEM_NAME=Darwin \
+        -DCMAKE_OSX_SYSROOT="macosx" \
+        -DCMAKE_OSX_ARCHITECTURES="${ARCH}" \
+        -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOS_DEPLOYMENT_TARGET}" \
+        -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
+        -DBUILD_SHARED_LIBS=OFF \
+        -DSIMPLEBLE_EXCLUDE_C=ON
+
+    cmake --build "${BUILD_DIR}" --config Release --parallel
+    cmake --install "${BUILD_DIR}" --config Release
+
+    echo "Installed to ${INSTALL_DIR}"
+}
+
+# Build for iOS device
+build_for_ios_platform "iphoneos" "arm64"
+
+# Build for iOS simulator (Apple Silicon)
+build_for_ios_platform "iphonesimulator" "arm64"
+
+# Build for macOS (Apple Silicon)
+build_for_macos_platform "arm64"
+
+# Build for macOS (Intel)
+build_for_macos_platform "x86_64"
+
+# Create universal macOS library
+echo ""
+echo "Creating universal macOS library..."
+MACOS_UNIVERSAL_DIR="${APPLE_DIR}/simpleble_macosx_universal"
+mkdir -p "${MACOS_UNIVERSAL_DIR}/lib"
+cp -r "${APPLE_DIR}/simpleble_macosx_arm64/include" "${MACOS_UNIVERSAL_DIR}/"
+lipo -create \
+    "${APPLE_DIR}/simpleble_macosx_arm64/lib/libsimpleble.a" \
+    "${APPLE_DIR}/simpleble_macosx_x86_64/lib/libsimpleble.a" \
+    -output "${MACOS_UNIVERSAL_DIR}/lib/libsimpleble.a"
+
+# Create XCFramework from the static libraries (iOS + macOS)
+echo ""
+echo "Creating XCFramework..."
+XCFRAMEWORK_PATH="${APPLE_DIR}/SimpleBLE.xcframework"
+rm -rf "${XCFRAMEWORK_PATH}"
+
+xcodebuild -create-xcframework \
+    -library "${APPLE_DIR}/simpleble_iphoneos_arm64/lib/libsimpleble.a" \
+    -headers "${APPLE_DIR}/simpleble_iphoneos_arm64/include" \
+    -library "${APPLE_DIR}/simpleble_iphonesimulator_arm64/lib/libsimpleble.a" \
+    -headers "${APPLE_DIR}/simpleble_iphonesimulator_arm64/include" \
+    -library "${MACOS_UNIVERSAL_DIR}/lib/libsimpleble.a" \
+    -headers "${MACOS_UNIVERSAL_DIR}/include" \
+    -output "${XCFRAMEWORK_PATH}"
+
+echo ""
+echo "SimpleBLE build complete!"
+echo "XCFramework created at: ${XCFRAMEWORK_PATH}"
+
+# Clean up intermediate build directories to reduce package size
+echo ""
+echo "Cleaning up intermediate build directories..."
+rm -rf "${APPLE_DIR}/build_iphoneos_arm64"
+rm -rf "${APPLE_DIR}/build_iphonesimulator_arm64"
+rm -rf "${APPLE_DIR}/build_macosx_arm64"
+rm -rf "${APPLE_DIR}/build_macosx_x86_64"
+rm -rf "${APPLE_DIR}/simpleble_iphoneos_arm64"
+rm -rf "${APPLE_DIR}/simpleble_iphonesimulator_arm64"
+rm -rf "${APPLE_DIR}/simpleble_macosx_arm64"
+rm -rf "${APPLE_DIR}/simpleble_macosx_x86_64"
+rm -rf "${APPLE_DIR}/simpleble_macosx_universal"
+
+echo ""
+echo "Package preparation complete!"