From a97697d8b8a1a93935ee9d5c3555472928526bb1 Mon Sep 17 00:00:00 2001 From: Rinat Enikeev Date: Sat, 16 Dec 2023 14:46:58 +0200 Subject: [PATCH] Remove dependency on RuuviLocalization in RuuviDFU Motivation: for single used string for the invalid arg case its not necessary to link against RuuviLocalization --- Packages/RuuviDFU/Sources/RuuviDFU/RuuviDFUError.swift | 7 ------- Packages/RuuviDFU/Sources/RuuviDFUImpl/DfuFlasher.swift | 3 ++- Packages/RuuviDFU/target.yml | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Packages/RuuviDFU/Sources/RuuviDFU/RuuviDFUError.swift b/Packages/RuuviDFU/Sources/RuuviDFU/RuuviDFUError.swift index dcb111ca0..aa6c7cd43 100644 --- a/Packages/RuuviDFU/Sources/RuuviDFU/RuuviDFUError.swift +++ b/Packages/RuuviDFU/Sources/RuuviDFU/RuuviDFUError.swift @@ -1,13 +1,6 @@ import Foundation -import RuuviLocalization public struct RuuviDfuError: Error { - public static let invalidFirmwareFile = RuuviDfuError( - description: RuuviLocalization.RuuviDfuError.invalidFirmwareFile - ) - public static let failedToConstructUUID = RuuviDfuError( - description: RuuviLocalization.RuuviDfuError.failedToConstructUUID - ) public let description: String public init(description: String) { self.description = description diff --git a/Packages/RuuviDFU/Sources/RuuviDFUImpl/DfuFlasher.swift b/Packages/RuuviDFU/Sources/RuuviDFUImpl/DfuFlasher.swift index 04ac983ef..a9f467d14 100644 --- a/Packages/RuuviDFU/Sources/RuuviDFUImpl/DfuFlasher.swift +++ b/Packages/RuuviDFU/Sources/RuuviDFUImpl/DfuFlasher.swift @@ -32,7 +32,8 @@ class DfuFlasher: NSObject { ) -> AnyPublisher { guard let uuid = UUID(uuidString: uuid) else { - return Fail(error: RuuviDfuError.failedToConstructUUID).eraseToAnyPublisher() + assertionFailure("Invalid UUID") + return Fail(error: RuuviDfuError(description: "Invalid UUID")).eraseToAnyPublisher() } let subject = PassthroughSubject() self.subject = subject diff --git a/Packages/RuuviDFU/target.yml b/Packages/RuuviDFU/target.yml index 747227eb2..20cd7d52d 100644 --- a/Packages/RuuviDFU/target.yml +++ b/Packages/RuuviDFU/target.yml @@ -8,4 +8,3 @@ targets: name: DFU dependencies: - package: NordicDFU - - target: RuuviLocalization