From 1977a4d65ff813b2b616dc4aa378567f22ea462b Mon Sep 17 00:00:00 2001 From: Thomas Ricouard Date: Tue, 11 Jun 2024 08:24:04 +0200 Subject: [PATCH] Fix more warnings --- IceCubesApp/App/AppRegistry.swift | 2 +- IceCubesAppIntents/AppAccountEntity.swift | 3 --- IceCubesAppIntents/AppShortcuts.swift | 4 ++-- .../AccountWidget/AccountWidgetConfiguration.swift | 2 +- .../HashtagPostsWidgetConfiguration.swift | 2 +- .../ListsWidget/ListsWidgetConfiguration.swift | 2 +- .../MentionWidget/MentionWidgetConfiguration.swift | 2 +- IceCubesNotifications/NotificationService.swift | 2 +- Packages/DesignSystem/Sources/DesignSystem/ColorSet.swift | 8 ++++---- .../Sources/DesignSystem/Resources/Colors.swift | 2 +- Packages/Env/Sources/Env/Ext/AppStorage.swift | 2 +- Packages/Env/Sources/Env/PushNotificationsService.swift | 4 ++-- Packages/Env/Sources/Env/UserPreferences.swift | 2 +- .../StatusKit/Sources/StatusKit/Editor/ViewModel.swift | 2 +- .../Sources/StatusKit/Row/StatusActionButtonStyle.swift | 3 ++- .../StatusKit/Row/Subviews/StatusRowTranslateView.swift | 2 +- 16 files changed, 21 insertions(+), 23 deletions(-) diff --git a/IceCubesApp/App/AppRegistry.swift b/IceCubesApp/App/AppRegistry.swift index 43a3fde5..52de18a5 100644 --- a/IceCubesApp/App/AppRegistry.swift +++ b/IceCubesApp/App/AppRegistry.swift @@ -228,7 +228,7 @@ struct ActivityView: UIViewControllerRepresentable { func updateUIViewController(_: UIActivityViewController, context _: UIViewControllerRepresentableContext) {} } -extension URL: Identifiable { +extension URL: @retroactive Identifiable { public var id: String { absoluteString } diff --git a/IceCubesAppIntents/AppAccountEntity.swift b/IceCubesAppIntents/AppAccountEntity.swift index e6cb0f09..0797672b 100644 --- a/IceCubesAppIntents/AppAccountEntity.swift +++ b/IceCubesAppIntents/AppAccountEntity.swift @@ -5,9 +5,6 @@ import Foundation import Models import Network -extension IntentDescription: @unchecked Sendable {} -extension TypeDisplayRepresentation: @unchecked Sendable {} - public struct AppAccountEntity: Identifiable, AppEntity { public var id: String { account.id } diff --git a/IceCubesAppIntents/AppShortcuts.swift b/IceCubesAppIntents/AppShortcuts.swift index 7b5ded40..c9768ebb 100644 --- a/IceCubesAppIntents/AppShortcuts.swift +++ b/IceCubesAppIntents/AppShortcuts.swift @@ -32,8 +32,8 @@ struct AppShortcuts: AppShortcutsProvider { AppShortcut( intent: PostImageIntent(), phrases: [ - "Post images \(\.$images) in \(.applicationName)", - "Send photos \(\.$images) with \(.applicationName)", + "Post images images in \(.applicationName)", + "Send photos with \(.applicationName)", ], shortTitle: "Post a status with an image", systemImageName: "photo" diff --git a/IceCubesAppWidgetsExtension/AccountWidget/AccountWidgetConfiguration.swift b/IceCubesAppWidgetsExtension/AccountWidget/AccountWidgetConfiguration.swift index 7a26422f..a21f5201 100644 --- a/IceCubesAppWidgetsExtension/AccountWidget/AccountWidgetConfiguration.swift +++ b/IceCubesAppWidgetsExtension/AccountWidget/AccountWidgetConfiguration.swift @@ -2,7 +2,7 @@ import AppIntents import WidgetKit struct AccountWidgetConfiguration: WidgetConfigurationIntent { - static let title: LocalizedStringResource = "Configuration" + static let title: LocalizedStringResource = "Account Widget Configuration" static let description = IntentDescription("Choose the account for this widget") @Parameter(title: "Account") diff --git a/IceCubesAppWidgetsExtension/HashtagPostsWidget/HashtagPostsWidgetConfiguration.swift b/IceCubesAppWidgetsExtension/HashtagPostsWidget/HashtagPostsWidgetConfiguration.swift index 8aa70af9..c094aff2 100644 --- a/IceCubesAppWidgetsExtension/HashtagPostsWidget/HashtagPostsWidgetConfiguration.swift +++ b/IceCubesAppWidgetsExtension/HashtagPostsWidget/HashtagPostsWidgetConfiguration.swift @@ -2,7 +2,7 @@ import AppIntents import WidgetKit struct HashtagPostsWidgetConfiguration: WidgetConfigurationIntent { - static let title: LocalizedStringResource = "Configuration" + static let title: LocalizedStringResource = "Widget Configuration" static let description = IntentDescription("Choose the account and hashtag for this widget") @Parameter(title: "Account") diff --git a/IceCubesAppWidgetsExtension/ListsWidget/ListsWidgetConfiguration.swift b/IceCubesAppWidgetsExtension/ListsWidget/ListsWidgetConfiguration.swift index 62015f6c..ebe4e0db 100644 --- a/IceCubesAppWidgetsExtension/ListsWidget/ListsWidgetConfiguration.swift +++ b/IceCubesAppWidgetsExtension/ListsWidget/ListsWidgetConfiguration.swift @@ -2,7 +2,7 @@ import AppIntents import WidgetKit struct ListsWidgetConfiguration: WidgetConfigurationIntent { - static let title: LocalizedStringResource = "Configuration" + static let title: LocalizedStringResource = "List Widget Configuration" static let description = IntentDescription("Choose the account and list for this widget") @Parameter(title: "Account") diff --git a/IceCubesAppWidgetsExtension/MentionWidget/MentionWidgetConfiguration.swift b/IceCubesAppWidgetsExtension/MentionWidget/MentionWidgetConfiguration.swift index 0f0fc81b..9dbe64a3 100644 --- a/IceCubesAppWidgetsExtension/MentionWidget/MentionWidgetConfiguration.swift +++ b/IceCubesAppWidgetsExtension/MentionWidget/MentionWidgetConfiguration.swift @@ -2,7 +2,7 @@ import AppIntents import WidgetKit struct MentionsWidgetConfiguration: WidgetConfigurationIntent { - static let title: LocalizedStringResource = "Configuration" + static let title: LocalizedStringResource = "Mentions Widget Configuration" static let description = IntentDescription("Choose the account for this widget") @Parameter(title: "Account") diff --git a/IceCubesNotifications/NotificationService.swift b/IceCubesNotifications/NotificationService.swift index 25e48996..eb934c04 100644 --- a/IceCubesNotifications/NotificationService.swift +++ b/IceCubesNotifications/NotificationService.swift @@ -1,7 +1,7 @@ import AppAccount import CryptoKit import Env -@preconcurrency import Intents +import Intents import KeychainSwift import Models import Network diff --git a/Packages/DesignSystem/Sources/DesignSystem/ColorSet.swift b/Packages/DesignSystem/Sources/DesignSystem/ColorSet.swift index 1b6d8efa..37b34f96 100644 --- a/Packages/DesignSystem/Sources/DesignSystem/ColorSet.swift +++ b/Packages/DesignSystem/Sources/DesignSystem/ColorSet.swift @@ -9,7 +9,7 @@ public let availableColorsSets: [ColorSetCouple] = .init(light: ConstellationLight(), dark: ConstellationDark()), .init(light: ThreadsLight(), dark: ThreadsDark())] -public protocol ColorSet { +public protocol ColorSet: Sendable { var name: ColorSetName { get } var scheme: ColorScheme { get } var tintColor: Color { get set } @@ -18,11 +18,11 @@ public protocol ColorSet { var labelColor: Color { get set } } -public enum ColorScheme: String { +public enum ColorScheme: String, Sendable { case dark, light } -public enum ColorSetName: String { +public enum ColorSetName: String, Sendable { case iceCubeDark = "Ice Cube - Dark" case iceCubeLight = "Ice Cube - Light" case iceCubeNeonDark = "Ice Cube Neon - Dark" @@ -39,7 +39,7 @@ public enum ColorSetName: String { case threadsDark = "Threads - Dark" } -public struct ColorSetCouple: Identifiable { +public struct ColorSetCouple: Identifiable, Sendable { public var id: String { dark.name.rawValue + light.name.rawValue } diff --git a/Packages/DesignSystem/Sources/DesignSystem/Resources/Colors.swift b/Packages/DesignSystem/Sources/DesignSystem/Resources/Colors.swift index 84028a8c..409f5caa 100644 --- a/Packages/DesignSystem/Sources/DesignSystem/Resources/Colors.swift +++ b/Packages/DesignSystem/Sources/DesignSystem/Resources/Colors.swift @@ -18,7 +18,7 @@ public extension Color { } } -extension Color: RawRepresentable { +extension Color: @retroactive RawRepresentable { public init?(rawValue: Int) { let red = Double((rawValue & 0xFF0000) >> 16) / 0xFF let green = Double((rawValue & 0x00FF00) >> 8) / 0xFF diff --git a/Packages/Env/Sources/Env/Ext/AppStorage.swift b/Packages/Env/Sources/Env/Ext/AppStorage.swift index 39a3eba3..2fa804a5 100644 --- a/Packages/Env/Sources/Env/Ext/AppStorage.swift +++ b/Packages/Env/Sources/Env/Ext/AppStorage.swift @@ -1,6 +1,6 @@ import Foundation -extension Array: RawRepresentable where Element: Codable { +extension Array: @retroactive RawRepresentable where Element: Codable { public init?(rawValue: String) { guard let data = rawValue.data(using: .utf8), let result = try? JSONDecoder().decode([Element].self, from: data) diff --git a/Packages/Env/Sources/Env/PushNotificationsService.swift b/Packages/Env/Sources/Env/PushNotificationsService.swift index 17bb27a9..b1d54e7f 100644 --- a/Packages/Env/Sources/Env/PushNotificationsService.swift +++ b/Packages/Env/Sources/Env/PushNotificationsService.swift @@ -8,8 +8,8 @@ import Observation import SwiftUI import UserNotifications -extension UNNotificationResponse: @unchecked Sendable {} -extension UNUserNotificationCenter: @unchecked Sendable {} +extension UNNotificationResponse: @unchecked @retroactive Sendable {} +extension UNUserNotificationCenter: @unchecked @retroactive Sendable {} public struct PushAccount: Equatable { public let server: String diff --git a/Packages/Env/Sources/Env/UserPreferences.swift b/Packages/Env/Sources/Env/UserPreferences.swift index 9233e26a..2a1ae9f2 100644 --- a/Packages/Env/Sources/Env/UserPreferences.swift +++ b/Packages/Env/Sources/Env/UserPreferences.swift @@ -536,7 +536,7 @@ import SwiftUI } } -extension UInt: RawRepresentable { +extension UInt: @retroactive RawRepresentable { public var rawValue: Int { Int(self) } diff --git a/Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift b/Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift index 9d443b10..8f2a68ef 100644 --- a/Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift +++ b/Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift @@ -982,4 +982,4 @@ extension StatusEditor.ViewModel: UITextPasteDelegate { } } -extension PhotosPickerItem: @unchecked Sendable {} +extension PhotosPickerItem: @unchecked @retroactive Sendable {} diff --git a/Packages/StatusKit/Sources/StatusKit/Row/StatusActionButtonStyle.swift b/Packages/StatusKit/Sources/StatusKit/Row/StatusActionButtonStyle.swift index 7cc4d2f8..92dab792 100644 --- a/Packages/StatusKit/Sources/StatusKit/Row/StatusActionButtonStyle.swift +++ b/Packages/StatusKit/Sources/StatusKit/Row/StatusActionButtonStyle.swift @@ -45,7 +45,8 @@ struct StatusActionButtonStyle: ButtonStyle { } } - struct SparklesView: View, Animatable { + @MainActor + struct SparklesView: View, @preconcurrency Animatable { var counter: Float var tint: Color var size: CGFloat diff --git a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTranslateView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTranslateView.swift index 222f1769..04da7a45 100644 --- a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTranslateView.swift +++ b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTranslateView.swift @@ -66,7 +66,7 @@ struct StatusRowTranslateView: View { generalTranslateButton .onChange(of: preferences.preferredTranslationType) { _, _ in withAnimation { - _ = viewModel.updatePreferredTranslation() + viewModel.updatePreferredTranslation() } }