From e4061d9e3e39f2c5fa98f2f1d77effee0b3cd86e Mon Sep 17 00:00:00 2001 From: DaneEvans Date: Tue, 8 Jul 2025 21:28:16 +1000 Subject: [PATCH] #2381: Change the factories - theoretically makes the CI not fail (#2385) --- .../mesh/repository/radio/BluetoothInterfaceFactory.kt | 4 +++- .../geeksville/mesh/repository/radio/MockInterfaceFactory.kt | 4 +++- .../geeksville/mesh/repository/radio/NopInterfaceFactory.kt | 4 +++- .../mesh/repository/radio/SerialInterfaceFactory.kt | 4 +++- .../geeksville/mesh/repository/radio/TCPInterfaceFactory.kt | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterfaceFactory.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterfaceFactory.kt index 1120ad6d4..fe9664fd7 100644 --- a/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterfaceFactory.kt +++ b/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterfaceFactory.kt @@ -23,4 +23,6 @@ import dagger.assisted.AssistedFactory * Factory for creating `BluetoothInterface` instances. */ @AssistedFactory -interface BluetoothInterfaceFactory : InterfaceFactorySpi \ No newline at end of file +interface BluetoothInterfaceFactory { + fun create(rest: String): BluetoothInterface +} \ No newline at end of file diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterfaceFactory.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterfaceFactory.kt index 559440884..689b16a42 100644 --- a/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterfaceFactory.kt +++ b/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterfaceFactory.kt @@ -23,4 +23,6 @@ import dagger.assisted.AssistedFactory * Factory for creating `MockInterface` instances. */ @AssistedFactory -interface MockInterfaceFactory : InterfaceFactorySpi \ No newline at end of file +interface MockInterfaceFactory { + fun create(rest: String): MockInterface +} \ No newline at end of file diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterfaceFactory.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterfaceFactory.kt index 24c22d099..9ba0f32de 100644 --- a/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterfaceFactory.kt +++ b/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterfaceFactory.kt @@ -23,4 +23,6 @@ import dagger.assisted.AssistedFactory * Factory for creating `NopInterface` instances. */ @AssistedFactory -interface NopInterfaceFactory : InterfaceFactorySpi \ No newline at end of file +interface NopInterfaceFactory { + fun create(rest: String): NopInterface +} \ No newline at end of file diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterfaceFactory.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterfaceFactory.kt index eab75a67a..88d8a8527 100644 --- a/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterfaceFactory.kt +++ b/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterfaceFactory.kt @@ -23,4 +23,6 @@ import dagger.assisted.AssistedFactory * Factory for creating `SerialInterface` instances. */ @AssistedFactory -interface SerialInterfaceFactory : InterfaceFactorySpi \ No newline at end of file +interface SerialInterfaceFactory { + fun create(rest: String): SerialInterface +} \ No newline at end of file diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterfaceFactory.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterfaceFactory.kt index da9449ac7..abeee0556 100644 --- a/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterfaceFactory.kt +++ b/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterfaceFactory.kt @@ -23,4 +23,6 @@ import dagger.assisted.AssistedFactory * Factory for creating `TCPInterface` instances. */ @AssistedFactory -interface TCPInterfaceFactory : InterfaceFactorySpi \ No newline at end of file +interface TCPInterfaceFactory { + fun create(rest: String): TCPInterface +} \ No newline at end of file