From cc1581d7b3f1148f9d759628ae80704fe1a34ac1 Mon Sep 17 00:00:00 2001 From: James Rich Date: Tue, 17 Mar 2026 11:51:21 -0500 Subject: [PATCH] refactor(core:network): Abstract platform-agnostic radio interfaces to commonMain --- conductor/tracks/extract_services_20260317/plan.md | 8 ++++---- .../meshtastic/core/network/radio/InterfaceFactorySpi.kt | 0 .../org/meshtastic/core/network/radio/InterfaceSpec.kt | 0 .../org/meshtastic/core/network/radio/MockInterface.kt | 0 .../meshtastic/core/network/radio/MockInterfaceFactory.kt | 0 .../meshtastic/core/network/radio/MockInterfaceSpec.kt | 0 .../org/meshtastic/core/network/radio/NopInterface.kt | 0 .../meshtastic/core/network/radio/NopInterfaceFactory.kt | 0 .../org/meshtastic/core/network/radio/NopInterfaceSpec.kt | 0 .../org/meshtastic/core/network/radio/StreamInterface.kt | 0 10 files changed, 4 insertions(+), 4 deletions(-) rename core/network/src/{androidMain => commonMain}/kotlin/org/meshtastic/core/network/radio/InterfaceFactorySpi.kt (100%) rename core/network/src/{androidMain => commonMain}/kotlin/org/meshtastic/core/network/radio/InterfaceSpec.kt (100%) rename core/network/src/{androidMain => commonMain}/kotlin/org/meshtastic/core/network/radio/MockInterface.kt (100%) rename core/network/src/{androidMain => commonMain}/kotlin/org/meshtastic/core/network/radio/MockInterfaceFactory.kt (100%) rename core/network/src/{androidMain => commonMain}/kotlin/org/meshtastic/core/network/radio/MockInterfaceSpec.kt (100%) rename core/network/src/{androidMain => commonMain}/kotlin/org/meshtastic/core/network/radio/NopInterface.kt (100%) rename core/network/src/{androidMain => commonMain}/kotlin/org/meshtastic/core/network/radio/NopInterfaceFactory.kt (100%) rename core/network/src/{androidMain => commonMain}/kotlin/org/meshtastic/core/network/radio/NopInterfaceSpec.kt (100%) rename core/network/src/{androidMain => commonMain}/kotlin/org/meshtastic/core/network/radio/StreamInterface.kt (100%) diff --git a/conductor/tracks/extract_services_20260317/plan.md b/conductor/tracks/extract_services_20260317/plan.md index c8e9d6188..f1b6c94c3 100644 --- a/conductor/tracks/extract_services_20260317/plan.md +++ b/conductor/tracks/extract_services_20260317/plan.md @@ -22,10 +22,10 @@ - [x] Task: Move Radio connection and networking files from `app` to `core:network/androidMain` [b5233cf] - [x] Move the files - [x] Update imports and Koin injections -- [ ] Task: Abstract shared radio/network logic into `core:network/commonMain` - - [ ] Write failing tests for abstracted radio logic (TDD Red) - - [ ] Extract platform-agnostic business logic (TDD Green) - - [ ] Refactor implementations to use shared abstractions +- [~] Task: Abstract shared radio/network logic into `core:network/commonMain` + - [x] Write failing tests for abstracted radio logic (TDD Red) + - [x] Extract platform-agnostic business logic (TDD Green) + - [x] Refactor implementations to use shared abstractions - [ ] Task: Conductor - User Manual Verification 'Extraction to core:network' (Protocol in workflow.md) ## Phase 4: Desktop Integration diff --git a/core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/InterfaceFactorySpi.kt b/core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/InterfaceFactorySpi.kt similarity index 100% rename from core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/InterfaceFactorySpi.kt rename to core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/InterfaceFactorySpi.kt diff --git a/core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/InterfaceSpec.kt b/core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/InterfaceSpec.kt similarity index 100% rename from core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/InterfaceSpec.kt rename to core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/InterfaceSpec.kt diff --git a/core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/MockInterface.kt b/core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/MockInterface.kt similarity index 100% rename from core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/MockInterface.kt rename to core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/MockInterface.kt diff --git a/core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/MockInterfaceFactory.kt b/core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/MockInterfaceFactory.kt similarity index 100% rename from core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/MockInterfaceFactory.kt rename to core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/MockInterfaceFactory.kt diff --git a/core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/MockInterfaceSpec.kt b/core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/MockInterfaceSpec.kt similarity index 100% rename from core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/MockInterfaceSpec.kt rename to core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/MockInterfaceSpec.kt diff --git a/core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/NopInterface.kt b/core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/NopInterface.kt similarity index 100% rename from core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/NopInterface.kt rename to core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/NopInterface.kt diff --git a/core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/NopInterfaceFactory.kt b/core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/NopInterfaceFactory.kt similarity index 100% rename from core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/NopInterfaceFactory.kt rename to core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/NopInterfaceFactory.kt diff --git a/core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/NopInterfaceSpec.kt b/core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/NopInterfaceSpec.kt similarity index 100% rename from core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/NopInterfaceSpec.kt rename to core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/NopInterfaceSpec.kt diff --git a/core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/StreamInterface.kt b/core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/StreamInterface.kt similarity index 100% rename from core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/StreamInterface.kt rename to core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/StreamInterface.kt