simplejsble 0.0.28 → 0.0.29

package/NitroSimplejsble.podspec

@@ -10,31 +10,36 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => min_ios_version_supported }
+  s.platforms    = {
+    :ios => min_ios_version_supported,
+    :osx => '10.13'
+  }
 
   s.source = { :path => "." }
 
   # Build SimpleBLE from source only if XCFramework doesn't exist
   # When installed from npm, the pre-built XCFramework is already included
   s.prepare_command = <<-CMD
-    # Build iOS XCFramework if not present
+    # Build iOS/macOS XCFramework if not present
     if [ -d "ios/SimpleBLE.xcframework" ]; then
-      echo "SimpleBLE.xcframework (iOS) already exists, skipping build"
+      echo "SimpleBLE.xcframework already exists, skipping build"
     else
-      echo "Building SimpleBLE for iOS..."
+      echo "Building SimpleBLE for iOS and macOS..."
       set -e
       IOS_DIR="ios"
       IOS_DEPLOYMENT_TARGET="${IOS_DEPLOYMENT_TARGET:-13.4}"
-      
-      build_for_platform() {
+      MACOS_DEPLOYMENT_TARGET="${MACOS_DEPLOYMENT_TARGET:-10.13}"
+
+      # 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="${IOS_DIR}/build_${PLATFORM}_${ARCH}"
           local INSTALL_DIR="${IOS_DIR}/simpleble_${PLATFORM}_${ARCH}"
-      
+
           echo "Building SimpleBLE for ${PLATFORM} (${ARCH})..."
-      
+
           cmake -B "${BUILD_DIR}" -S "${IOS_DIR}" \
               -DCMAKE_BUILD_TYPE=Release \
               -DCMAKE_SYSTEM_NAME=iOS \
@@ -44,31 +49,74 @@ Pod::Spec.new do |s|
               -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="${IOS_DIR}/build_macosx_${ARCH}"
+          local INSTALL_DIR="${IOS_DIR}/simpleble_macosx_${ARCH}"
+
+          echo "Building SimpleBLE for macOS (${ARCH})..."
+
+          cmake -B "${BUILD_DIR}" -S "${IOS_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 device
-      build_for_platform "iphoneos" "arm64"
-      
-      # Build for simulator (Apple Silicon)
-      build_for_platform "iphonesimulator" "arm64"
-      
-      # Create XCFramework from the static libraries
+
+      # 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 "Creating universal macOS library..."
+      MACOS_UNIVERSAL_DIR="${IOS_DIR}/simpleble_macosx_universal"
+      mkdir -p "${MACOS_UNIVERSAL_DIR}/lib"
+      cp -r "${IOS_DIR}/simpleble_macosx_arm64/include" "${MACOS_UNIVERSAL_DIR}/"
+      lipo -create \
+          "${IOS_DIR}/simpleble_macosx_arm64/lib/libsimpleble.a" \
+          "${IOS_DIR}/simpleble_macosx_x86_64/lib/libsimpleble.a" \
+          -output "${MACOS_UNIVERSAL_DIR}/lib/libsimpleble.a"
+
+      # Create XCFramework from the static libraries (iOS + macOS)
       echo "Creating XCFramework..."
       XCFRAMEWORK_PATH="${IOS_DIR}/SimpleBLE.xcframework"
       rm -rf "${XCFRAMEWORK_PATH}"
-      
+
       xcodebuild -create-xcframework \
           -library "${IOS_DIR}/simpleble_iphoneos_arm64/lib/libsimpleble.a" \
           -headers "${IOS_DIR}/simpleble_iphoneos_arm64/include" \
           -library "${IOS_DIR}/simpleble_iphonesimulator_arm64/lib/libsimpleble.a" \
           -headers "${IOS_DIR}/simpleble_iphonesimulator_arm64/include" \
+          -library "${MACOS_UNIVERSAL_DIR}/lib/libsimpleble.a" \
+          -headers "${MACOS_UNIVERSAL_DIR}/include" \
           -output "${XCFRAMEWORK_PATH}"
-      
+
       echo "SimpleBLE build complete!"
       echo "XCFramework created at: ${XCFRAMEWORK_PATH}"
     fi
@@ -95,9 +143,12 @@ Pod::Spec.new do |s|
 
   # Required frameworks for SimpleBLE
   s.frameworks = ['Foundation', 'CoreBluetooth']
+  # macOS requires additional frameworks for classic Bluetooth support
+  s.osx.frameworks = ['Foundation', 'CoreBluetooth', 'IOBluetooth', 'IOKit']
 
-  # Vendored XCFramework containing all architectures
+  # Vendored XCFramework containing all architectures (iOS + macOS)
   s.ios.vendored_frameworks = 'ios/SimpleBLE.xcframework'
+  s.osx.vendored_frameworks = 'ios/SimpleBLE.xcframework'
 
   # Configure header search paths for SimpleBLE
   current_pod_target_xcconfig = s.attributes_hash['pod_target_xcconfig'] || {}
@@ -107,6 +158,10 @@ Pod::Spec.new do |s|
       # iOS header paths
       '"$(PODS_TARGET_SRCROOT)/ios/simpleble_iphoneos_arm64/include"',
       '"$(PODS_TARGET_SRCROOT)/ios/simpleble_iphonesimulator_arm64/include"',
+      # macOS header paths
+      '"$(PODS_TARGET_SRCROOT)/ios/simpleble_macosx_arm64/include"',
+      '"$(PODS_TARGET_SRCROOT)/ios/simpleble_macosx_x86_64/include"',
+      '"$(PODS_TARGET_SRCROOT)/ios/simpleble_macosx_universal/include"',
     ].join(' '),
   })
 end

package/android/SIMPLEDROIDBRIDGE_INTEGRATION.md

@@ -0,0 +1,77 @@
+# SimpleDroidBridge Integration Decision
+
+## Current Approach
+
+In `build.gradle`, the simpledroidbridge Java sources are included directly:
+
+```gradle
+sourceSets {
+  main {
+    java.srcDirs += ["../simpledroidbridge/src/main/java"]
+  }
+}
+```
+
+## Why Not Use `implementation project(":simpledroidbridge")`?
+
+### Option 1: `java.srcDirs` (Current)
+
+Compiles simpledroidbridge sources directly into the main library.
+
+**Pros:**
+- No configuration needed in consumer app
+- Works seamlessly in npm package context
+- No build config conflicts
+- React Native autolinking works out of the box
+
+**Cons:**
+- Sources compiled together (single output)
+
+### Option 2: `implementation project(":simpledroidbridge")`
+
+Would treat simpledroidbridge as a separate Gradle module dependency.
+
+**Pros:**
+- Cleaner separation of modules
+- Could be reused independently
+
+**Cons:**
+- Requires consumer app's `settings.gradle.kts` to include:
+  ```kotlin
+  include(":simpledroidbridge")
+  project(":simpledroidbridge").projectDir = File("node_modules/simplejsble/simpledroidbridge")
+  ```
+- `simpledroidbridge/build.gradle.kts` has its own SDK versions (`compileSdk = 31`, `minSdk = 31`) which may conflict with consumer apps
+- React Native autolinking doesn't handle transitive local project dependencies
+- Complex path resolution for npm packages
+
+## Comparison
+
+| Aspect | `java.srcDirs` | `project(":simpledroidbridge")` |
+|--------|----------------|--------------------------------|
+| Consumer setup | None required | Must modify settings.gradle |
+| Build config conflicts | None | Possible SDK version conflicts |
+| npm package compatibility | Works out of the box | Complex path resolution |
+| Autolinking | Works | Not supported |
+
+## Conclusion
+
+The `java.srcDirs` approach is the right choice for npm package distribution. Converting to a project dependency would add unnecessary friction for package consumers.
+
+## Package Structure
+
+The npm package bundles simpledroidbridge (defined in `package.json`):
+
+```json
+{
+  "files": [
+    "android/",
+    "simpledroidbridge/",
+    ...
+  ]
+}
+```
+
+This allows the relative path `../simpledroidbridge/src/main/java` to work correctly from the `android/` folder in both:
+- Monorepo development
+- npm package installation (`node_modules/simplejsble/`)

package/android/build.gradle

@@ -107,8 +107,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_1_9
+    targetCompatibility JavaVersion.VERSION_1_9
   }
 
   sourceSets {

package/android/gradle.properties

@@ -1,5 +1,5 @@
 NitroSimplejsble_kotlinVersion=2.1.20
-NitroSimplejsble_minSdkVersion=23
-NitroSimplejsble_targetSdkVersion=36
-NitroSimplejsble_compileSdkVersion=36
+NitroSimplejsble_minSdkVersion=31
+NitroSimplejsble_targetSdkVersion=31
+NitroSimplejsble_compileSdkVersion=31
 NitroSimplejsble_ndkVersion=27.1.12297006

package/ios/CMAKE_INSTALL_OPTIONS.md

@@ -0,0 +1,50 @@
+# CMake Install Options Reference
+
+## Install Target Destinations
+
+| Destination | Purpose | File Types |
+|-------------|---------|------------|
+| `ARCHIVE` | Static libraries and import libraries | `.a`, `.lib` (Windows import libs) |
+| `LIBRARY` | Shared libraries | `.so`, `.dylib` |
+| `RUNTIME` | Executables and DLLs | `.exe`, `.dll` |
+
+## Recommended Variables (via `GNUInstallDirs`)
+
+```cmake
+include(GNUInstallDirs)
+```
+
+| Variable | Default Value | Purpose |
+|----------|---------------|---------|
+| `CMAKE_INSTALL_LIBDIR` | `lib` | Library installation directory |
+| `CMAKE_INSTALL_INCLUDEDIR` | `include` | Header installation directory |
+| `CMAKE_INSTALL_BINDIR` | `bin` | Binary/executable installation directory |
+
+## Current iOS CMakeLists.txt
+
+```cmake
+install(TARGETS simpleble ARCHIVE DESTINATION lib)
+
+install(DIRECTORY ${PROJECT_ROOT_DIR}/simpleble/include/simpleble/ DESTINATION include/simpleble)
+install(DIRECTORY ${CMAKE_BINARY_DIR}/simpleble/export/simpleble/ DESTINATION include/simpleble)
+install(FILES ${PROJECT_ROOT_DIR}/dependencies/external/kvn/kvn_bytearray.h DESTINATION include/simpleble/kvn)
+```
+
+## Recommended Update (matching main simpleble pattern)
+
+```cmake
+include(GNUInstallDirs)
+
+install(TARGETS simpleble ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+install(DIRECTORY ${PROJECT_ROOT_DIR}/simpleble/include/simpleble/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/simpleble)
+install(DIRECTORY ${CMAKE_BINARY_DIR}/simpleble/export/simpleble/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/simpleble)
+install(FILES ${PROJECT_ROOT_DIR}/dependencies/external/kvn/kvn_bytearray.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/simpleble/kvn)
+```
+
+## Notes
+
+- For iOS static builds (`BUILD_SHARED_LIBS OFF`), only `ARCHIVE` is needed
+- `LIBRARY` is unnecessary since we're not building shared libraries
+- Using CMake variables instead of hardcoded paths improves portability
+- Header installation is required separately from library installation for XCFramework builds

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simplejsble",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "description": "React Native Bluetooth Low Energy library using SimpleBLE with Nitro Modules",
   "main": "lib/index",
   "module": "lib/index",
@@ -29,7 +29,7 @@
     "prepack": "npm run build && npx nitrogen && bash scripts/prepare-package.sh",
     "typecheck": "tsc --noEmit",
     "build": "tsc",
-    "clean": "rm -rf simpleble simpledroidbridge cmake dependencies VERSION nitrogen lib android/build android/.cxx android/.gradle ios/build_iphoneos_arm64 ios/build_iphonesimulator_arm64 ios/simpleble_iphoneos_arm64 ios/simpleble_iphonesimulator_arm64 ios/SimpleBLE.xcframework",
+    "clean": "rm -rf simpleble simpledroidbridge cmake dependencies VERSION nitrogen lib android/build android/.cxx android/.gradle ios/build_iphoneos_arm64 ios/build_iphonesimulator_arm64 ios/simpleble_iphoneos_arm64 ios/simpleble_iphonesimulator_arm64 ios/build_macosx_arm64 ios/build_macosx_x86_64 ios/simpleble_macosx_arm64 ios/simpleble_macosx_x86_64 ios/simpleble_macosx_universal ios/SimpleBLE.xcframework",
     "lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
     "prepublishOnly": "npm run typecheck",
     "postpublish": "npm run clean",
@@ -44,7 +44,8 @@
     "nitro",
     "nitro-modules",
     "ios",
-    "android"
+    "android",
+    "macos"
   ],
   "repository": {
     "type": "git",

package/lib/index.d.ts

@@ -1,3 +0,0 @@
-import type { Adapter } from "./specs/Adapter.nitro";
-export declare const HybridAdapter: Adapter;
-//# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGrD,eAAO,MAAM,aAAa,SAAsD,CAAC"}

package/lib/specs/Adapter.nitro.d.ts

@@ -1,10 +0,0 @@
-import { type HybridObject } from 'react-native-nitro-modules';
-export interface Adapter extends HybridObject<{
-    ios: 'c++';
-    android: 'c++';
-}> {
-    greet(name: string): string;
-    get_adapters(): Adapter[];
-    bluetooth_enabled(): boolean;
-}
-//# sourceMappingURL=Adapter.nitro.d.ts.map

package/lib/specs/Adapter.nitro.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Adapter.nitro.d.ts","sourceRoot":"","sources":["../../src/specs/Adapter.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAC9D,MAAM,WAAW,OAAQ,SAAQ,YAAY,CAAC;IAC5C,GAAG,EAAE,KAAK,CAAC;IACX,OAAO,EAAE,KAAK,CAAA;CACf,CAAC;IACA,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IAC3B,YAAY,IAAI,OAAO,EAAE,CAAA;IACzB,iBAAiB,IAAI,OAAO,CAAA;CAC7B"}