From d8d9f268c88975fe777140d0ef8f8d793244686c Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Wed, 12 Apr 2023 10:33:38 +0100 Subject: [PATCH] Fix project warnings (#791) - Swift 5.8 warnings - Run SwiftFormat 0.51.5 - Fix SwiftLint blanket_disable_command warnings. (Assets.swift will be fixed by SwiftGen). --- ElementX/Sources/Generated/Strings+Untranslated.swift | 1 + ElementX/Sources/Generated/Strings.swift | 1 + ElementX/Sources/Mocks/Generated/GeneratedMocks.swift | 2 +- ElementX/Sources/Other/SwiftUI/Views/LoadableImage.swift | 2 +- .../EmojiPickerScreen/EmojiPickerScreenViewModel.swift | 5 +++-- .../Strings/structured-swift5-element-untranslated.stencil | 1 + .../Templates/Strings/structured-swift5-element.stencil | 1 + UnitTests/Sources/DateTests.swift | 3 +++ UnitTests/Sources/MessageTimelineItemTests.swift | 5 +++-- 9 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ElementX/Sources/Generated/Strings+Untranslated.swift b/ElementX/Sources/Generated/Strings+Untranslated.swift index f13d64e79..ff7e2dbe3 100644 --- a/ElementX/Sources/Generated/Strings+Untranslated.swift +++ b/ElementX/Sources/Generated/Strings+Untranslated.swift @@ -83,3 +83,4 @@ extension UntranslatedL10n { private final class BundleToken {} +// swiftlint:enable all diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift index 0435fa395..87e957281 100644 --- a/ElementX/Sources/Generated/Strings.swift +++ b/ElementX/Sources/Generated/Strings.swift @@ -721,3 +721,4 @@ extension L10n { private final class BundleToken {} +// swiftlint:enable all diff --git a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift index 468329c49..7300a0aaf 100644 --- a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift +++ b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift @@ -1,4 +1,4 @@ -// Generated using Sourcery 2.0.1 — https://github.com/krzysztofzablocki/Sourcery +// Generated using Sourcery 2.0.2 — https://github.com/krzysztofzablocki/Sourcery // DO NOT EDIT // swiftlint:disable all diff --git a/ElementX/Sources/Other/SwiftUI/Views/LoadableImage.swift b/ElementX/Sources/Other/SwiftUI/Views/LoadableImage.swift index e3073347c..47f533104 100644 --- a/ElementX/Sources/Other/SwiftUI/Views/LoadableImage.swift +++ b/ElementX/Sources/Other/SwiftUI/Views/LoadableImage.swift @@ -72,7 +72,7 @@ struct LoadableImage: View { guard image == nil, let mediaSource else { return } if case let .success(image) = await imageProvider?.loadImageFromSource(mediaSource, size: size) { - self.cachedImage = image + cachedImage = image } } diff --git a/ElementX/Sources/Screens/EmojiPickerScreen/EmojiPickerScreenViewModel.swift b/ElementX/Sources/Screens/EmojiPickerScreen/EmojiPickerScreenViewModel.swift index 36b52cfae..c1aa99d63 100644 --- a/ElementX/Sources/Screens/EmojiPickerScreen/EmojiPickerScreenViewModel.swift +++ b/ElementX/Sources/Screens/EmojiPickerScreen/EmojiPickerScreenViewModel.swift @@ -50,8 +50,9 @@ class EmojiPickerScreenViewModel: EmojiPickerScreenViewModelType, EmojiPickerScr private func loadEmojis() { Task(priority: .userInitiated) { [weak self] in - let categories = await emojiProvider.getCategories(searchString: nil) - self?.state.categories = convert(emojiCategories: categories) + guard let self else { return } + let categories = await self.emojiProvider.getCategories(searchString: nil) + self.state.categories = convert(emojiCategories: categories) } } diff --git a/Tools/SwiftGen/Templates/Strings/structured-swift5-element-untranslated.stencil b/Tools/SwiftGen/Templates/Strings/structured-swift5-element-untranslated.stencil index 89209cdb7..484009ba2 100644 --- a/Tools/SwiftGen/Templates/Strings/structured-swift5-element-untranslated.stencil +++ b/Tools/SwiftGen/Templates/Strings/structured-swift5-element-untranslated.stencil @@ -90,3 +90,4 @@ private final class BundleToken {} {% else %} // No string found {% endif %} +// swiftlint:enable all diff --git a/Tools/SwiftGen/Templates/Strings/structured-swift5-element.stencil b/Tools/SwiftGen/Templates/Strings/structured-swift5-element.stencil index c6f0ae690..9509480b9 100644 --- a/Tools/SwiftGen/Templates/Strings/structured-swift5-element.stencil +++ b/Tools/SwiftGen/Templates/Strings/structured-swift5-element.stencil @@ -105,3 +105,4 @@ private final class BundleToken {} {% else %} // No string found {% endif %} +// swiftlint:enable all diff --git a/UnitTests/Sources/DateTests.swift b/UnitTests/Sources/DateTests.swift index 839b0051d..9dced63f9 100644 --- a/UnitTests/Sources/DateTests.swift +++ b/UnitTests/Sources/DateTests.swift @@ -18,6 +18,7 @@ import XCTest // swiftlint:disable force_unwrapping + class DateTests: XCTestCase { let calendar = Calendar.current let startOfToday = Calendar.current.startOfDay(for: .now) @@ -41,3 +42,5 @@ class DateTests: XCTestCase { XCTAssertEqual(theMillennium.formattedMinimal(), theMillennium.formatted(.dateTime.year().day().month())) } } + +// swiftlint:enable force_unwrapping diff --git a/UnitTests/Sources/MessageTimelineItemTests.swift b/UnitTests/Sources/MessageTimelineItemTests.swift index b6c452cd5..ba45b0754 100644 --- a/UnitTests/Sources/MessageTimelineItemTests.swift +++ b/UnitTests/Sources/MessageTimelineItemTests.swift @@ -18,7 +18,6 @@ import MatrixRustSDK import XCTest -// swiftlint:disable force_unwrapping class MessageTimelineItemTests: XCTestCase { // MARK: Image @@ -95,6 +94,8 @@ class MessageTimelineItemTests: XCTestCase { source: mediaSourceFromUrl(url: "mxc://doesnt/matter"), info: makeAudioInfo(mimetype: nil)) let messageItem = MockEventTimelineItem.message(from: imageContent) + + // swiftlint:disable:next force_unwrapping XCTAssertTrue(messageItem.contentType!.conforms(to: .mpeg4Audio)) } @@ -128,7 +129,6 @@ class MessageTimelineItemTests: XCTestCase { // MARK: - Mocks -// swiftlint:disable force_cast private struct MockEventTimelineItem: EventTimelineItemProtocol { static func message(from content: Content) -> MessageTimelineItem { let item = MockEventTimelineItem(underlyingContent: content) @@ -137,6 +137,7 @@ private struct MockEventTimelineItem: EventTimelineItemProtocol { let underlyingContent: MessageContentProtocol + // swiftlint:disable:next force_cast func content() -> MatrixRustSDK.TimelineItemContent { underlyingContent as! TimelineItemContent } func eventId() -> String? { UUID().uuidString }