[tango-tango-mashbill]

Pull request updated by mashbill for dballance from a mashbill Session.

---

Brings the fork's master up to date. It merges PhilipsHue/flutter_reactive_ble master (e8b43fb) with our feat/session-restoration work (5425f31), so that reactive_ble_mobile supports Swift Package Manager on iOS/macOS. All fork features are kept. After this lands, master holds the latest upstream plus our changes. It also covers #1, whose 25 commits are included with unchanged SHAs.

Merge with "Create a merge commit", not squash or rebase. Shine pins f0c8667, which has to stay reachable from master. Squashing would also make the next upstream merge conflict again.

Upstream adds 15 commits since the fork point (a6dd926, June 2024), including:

• SwiftPM support (Add Swift Package Manager support PhilipsHue/flutter_reactive_ble#932)
• built-in Kotlin, AGP 9, SDK 37 (Support built-in Kotlin, AGP 9.0+ and Android SDK 37 PhilipsHue/flutter_reactive_ble#938)
• async characteristic subscription (feat: Add async characteristic subscription that awaits BLE setup PhilipsHue/flutter_reactive_ble#945)
• shared darwin source / macOS (Implement macos using shared darwin source PhilipsHue/flutter_reactive_ble#889)
• protobuf upgrade to 6.x (Bump protobuf to 6.0.0 PhilipsHue/flutter_reactive_ble#923)
• fix for an index crash in Central.swift

Commits

• e696ae2: the merge, with conflict resolutions.
• f0c8667: raises the minimum SwiftProtobuf to 1.31.0 in Package.swift and ~> 1.31 in the podspec, because the regenerated Swift needs it. Also fixes the protoc output path in protos/README.md.

Conflict resolutions

• connected_device_operation.dart, reactive_ble.dart: kept the fork's attachToCharacteristicSubscription / attachToSubscription and upstream's subscribeToCharacteristicAsync / subscribeAsync. Platform setup is now isAndroid || isIOS || isMacOS and still passes restorationKey.
• reactive_ble_mobile/android/build.gradle: took upstream (AGP 9.1, built-in Kotlin, SDK 37). The fork's only change there was an SDK bump.
• Generated protobuf (bledata.pb*.dart, bledata.pb.swift): regenerated from the merged bledata.proto with protoc 34.1, protoc_plugin 25.0.0 and protoc-gen-swift 1.36.1. Compared with upstream's files, the only additions are the fork's messages.
• Mocks and pubspec.lock files: regenerated with build_runner and flutter pub get.
• Example app:
  • example/android/*, AppDelegate.swift: took upstream; the fork only had version bumps there.
  • Podfile.lock: deleted, as upstream did.
  • project.pbxproj: the Pods references are removed. A broken Info-Debug.plist reference was replaced with upstream's Info.plist.

iOS source move

• Everything in ios/Classes/ now lives in darwin/reactive_ble_mobile/Sources/reactive_ble_mobile/, including the fork-only BleData extras/RestoredPeripheral.swift.
• ios/ is gone, and nothing references SwiftReactiveBlePlugin any more.
• Fork logic in PluginController.swift, Central.swift, CentralManagerDelegate.swift and ReactiveBlePlugin.swift is intact:
  • the restore identifier and willRestoreState
  • the restored_device and bond_update event channels
  • initialize with InitializationRequest
• Fix: the fork's event channels used registrar.messenger(), which doesn't compile on macOS. They now use the shared messenger.

Verification

• flutter analyze is clean in all packages, and flutter test passes: 4, 93, 61 and 1 tests.
• swiftc -parse passes on all Swift files.
• The plugin type-checks against stubbed CoreBluetooth/Flutter modules on Linux.
• In shine (AGP 9.1.1, builtInKotlin=false), :reactive_ble_mobile:compileDebugKotlin succeeds.

Needs a Mac / device check

• A real Xcode build with SwiftPM on and with CocoaPods. The stubs can't confirm that CoreBluetooth delegate signatures match Apple's API.
• State restoration on a device, including re-attach on top of feat: Add async characteristic subscription that awaits BLE setup PhilipsHue/flutter_reactive_ble#945's async subscribe.
• The podspec still has upstream's Protobuf ~> 3.5 and swift_version 4.2. Check these don't clash with the app's Pods.
• The example's Info-Release.plist reference points to a missing file. This was already true before the merge.

Future upstream updates

Run git fetch upstream && git merge upstream/master on a branch, then open a PR into master and merge it with a merge commit. Regenerate the generated files (protobuf, mocks, lock files) rather than resolving them by hand.