simplejsble 0.0.32 → 0.0.34

package/NitroSimplejsble.podspec

@@ -22,15 +22,15 @@ Pod::Spec.new do |s|
 
   s.source_files = [
     # Implementation (Swift)
-    "ios/**/*.{swift}",
+    "apple/**/*.{swift}",
     # Autolinking/Registration (Objective-C++)
-    "ios/**/*.{m,mm}",
+    "apple/**/*.{m,mm}",
     # Implementation (C++ objects)
     "cpp/**/*.{hpp,cpp}",
   ]
 
   # Exclude CMakeLists.txt from source files
-  s.exclude_files = ["ios/CMakeLists.txt"]
+  s.exclude_files = ["apple/CMakeLists.txt"]
 
   load 'nitrogen/generated/ios/NitroSimplejsble+autolinking.rb'
   add_nitrogen_files(s)
@@ -45,8 +45,8 @@ Pod::Spec.new do |s|
   s.osx.frameworks = ['Foundation', 'CoreBluetooth', 'IOBluetooth', 'IOKit']
 
   # Vendored XCFramework containing all architectures (iOS + macOS)
-  s.ios.vendored_frameworks = 'ios/SimpleBLE.xcframework'
-  s.osx.vendored_frameworks = 'ios/SimpleBLE.xcframework'
+  s.ios.vendored_frameworks = 'apple/SimpleBLE.xcframework'
+  s.osx.vendored_frameworks = 'apple/SimpleBLE.xcframework'
 
   # Configure header search paths for SimpleBLE XCFramework
   # Headers are inside the XCFramework slices - we include all platforms so it works for any target
@@ -55,9 +55,9 @@ Pod::Spec.new do |s|
     'HEADER_SEARCH_PATHS' => [
       '"$(inherited)"',
       # XCFramework headers for each platform slice
-      '"$(PODS_TARGET_SRCROOT)/ios/SimpleBLE.xcframework/ios-arm64/Headers"',
-      '"$(PODS_TARGET_SRCROOT)/ios/SimpleBLE.xcframework/ios-arm64-simulator/Headers"',
-      '"$(PODS_TARGET_SRCROOT)/ios/SimpleBLE.xcframework/macos-arm64_x86_64/Headers"',
+      '"$(PODS_TARGET_SRCROOT)/apple/SimpleBLE.xcframework/ios-arm64/Headers"',
+      '"$(PODS_TARGET_SRCROOT)/apple/SimpleBLE.xcframework/ios-arm64-simulator/Headers"',
+      '"$(PODS_TARGET_SRCROOT)/apple/SimpleBLE.xcframework/macos-arm64_x86_64/Headers"',
     ].join(' '),
   })
 end

package/README.md

@@ -0,0 +1,51 @@
+# simplejsble
+
+React Native Bluetooth Low Energy library using SimpleBLE with Nitro Modules.
+
+## iOS Build Issue Fix
+
+If you encounter this error when building your iOS project:
+
+```
+Property with 'retain (or strong)' attribute must be of object type
+/Users/.../Pods/Headers/Public/React-Core/React/RCTBridgeModule.h:164:1
+```
+
+Add this to your `Podfile` in the `post_install` block:
+
+```ruby
+post_install do |installer|
+  # Fix RCTBridgeModule.h dispatch_queue_t property issue
+  # See: https://github.com/facebook/react-native/issues/29681
+  rct_bridge_module_h = File.join(installer.sandbox.root, 'Headers/Public/React-Core/React/RCTBridgeModule.h')
+  
+  if File.exist?(rct_bridge_module_h)
+    text = File.read(rct_bridge_module_h)
+    new_contents = text.gsub(
+      /@property \(nonatomic, strong, readonly\) dispatch_queue_t methodQueue RCT_DEPRECATED;/,
+      '@property (nonatomic, assign, readonly) dispatch_queue_t methodQueue RCT_DEPRECATED;'
+    )
+    
+    if text != new_contents
+      File.open(rct_bridge_module_h, "w") { |file| file.puts new_contents }
+      puts "✓ Patched RCTBridgeModule.h methodQueue property (strong -> assign)"
+    end
+  end
+end
+```
+
+Then run `pod install` again.
+
+## Installation
+
+```bash
+npm install simplejsble
+```
+
+## Usage
+
+```typescript
+import { Adapter } from 'simplejsble';
+
+// Your code here
+```

package/android/CMakeLists.txt

@@ -56,9 +56,11 @@ include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/NitroSimplejsble+autol
 target_include_directories(NitroSimplejsble PRIVATE
     src/main/cpp
     ../cpp
+    ${JNI_INCLUDE_DIRS}
 )
 
 find_library(LOG_LIB log)
+find_package(JNI REQUIRED)
 
 # Link all libraries together
 target_link_libraries(NitroSimplejsble
@@ -66,6 +68,7 @@ target_link_libraries(NitroSimplejsble
     simpleble::simpleble
     android
     -ldl
+    ${JNI_LIBRARIES}
 )
 
 # Allow undefined JNI symbols (resolved at runtime)

package/{ios → apple}/CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.21)
 
 # Determine if we're in the SimpleBLE monorepo or npm package
-# In monorepo: packages/simplejsble/ios → ../../../.. has cmake/
-# In npm: node_modules/simplejsble/ios → .. has cmake/ (bundled)
+# In monorepo: packages/simplejsble/apple → ../../../.. has cmake/
+# In npm: node_modules/simplejsble/apple → .. has cmake/ (bundled)
 # This is used by the podspec's prepare_command when building the XCFramework
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/prelude.cmake")
     # npm package - bundled cmake

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simplejsble",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "React Native Bluetooth Low Energy library using SimpleBLE with Nitro Modules",
   "main": "lib/index",
   "module": "lib/index",
@@ -12,7 +12,7 @@
     "lib",
     "nitrogen",
     "android/",
-    "ios/",
+    "apple/",
     "cpp/",
     "simpleble/",
     "simpledroidbridge/",
@@ -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 tsconfig.tsbuildinfo 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",
+    "clean": "rm -rf simpleble simpledroidbridge cmake dependencies VERSION nitrogen lib tsconfig.tsbuildinfo android/build android/.cxx android/.gradle apple/build_iphoneos_arm64 apple/build_iphonesimulator_arm64 apple/simpleble_iphoneos_arm64 apple/simpleble_iphonesimulator_arm64 apple/build_macosx_arm64 apple/build_macosx_x86_64 apple/simpleble_macosx_arm64 apple/simpleble_macosx_x86_64 apple/simpleble_macosx_universal apple/SimpleBLE.xcframework",
     "lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
     "prepublishOnly": "npm run typecheck",
     "postpublish": "npm run clean",

package/{ios → apple}/SimpleBLE.xcframework/Info.plist

@@ -10,7 +10,7 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libsimpleble.a</string>
 			<key>SupportedArchitectures</key>
@@ -19,8 +19,6 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -28,15 +26,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>
 		<dict>
 			<key>BinaryPath</key>
@@ -44,16 +43,17 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64-simulator</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>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>