Remove SwiftyBeaver and rebuild logging on OSLog

AppPackage/Package.swift

@@ -13,7 +13,6 @@ var dependencies: [PackageDescription.Package.Dependency] = [
     .package(url: "https://github.com/SDWebImage/SDWebImageWebPCoder", from: "0.14.0"),
     .package(url: "https://github.com/SFSafeSymbols/SFSafeSymbols", from: "7.0.0"),
     .package(url: "https://github.com/SimplyDanny/SwiftLintPlugins", from: "0.63.0"),
-    .package(url: "https://github.com/SwiftyBeaver/SwiftyBeaver", from: "2.0.0"),
     .package(url: "https://github.com/ddddxxx/SwiftyOpenCC", exact: "2.0.0-beta"),
     .package(url: "https://github.com/fermoya/SwiftUIPager", from: "2.5.0"),
     .package(url: "https://github.com/gonzalezreal/SwiftCommonMark", from: "1.0.0"),
@@ -49,7 +48,6 @@ extension PackageDescription.Target.Dependency {
     static let sfSafeSymbols: Self = .product(name: "SFSafeSymbols", package: "SFSafeSymbols")
     static let swiftUINavigation: Self = .product(name: "SwiftUINavigation", package: "swift-navigation")
     static let swiftUIPager: Self = .product(name: "SwiftUIPager", package: "SwiftUIPager")
-    static let swiftyBeaver: Self = .product(name: "SwiftyBeaver", package: "SwiftyBeaver")
     static let ttProgressHUD: Self = .product(name: "TTProgressHUD", package: "TTProgressHUD")
     static let uiImageColors: Self = .product(name: "UIImageColors", package: "UIImageColors")
     static let waterfallGrid: Self = .product(name: "WaterfallGrid", package: "WaterfallGrid")
@@ -98,10 +96,11 @@ enum Module: String {
     case homeFeature = "HomeFeature"
     case imageClient = "ImageClient"
     case libraryClient = "LibraryClient"
-    case loggerClient = "LoggerClient"
+    case logsClient = "LogsClient"
     case migrationFeature = "MigrationFeature"
     case networkingFeature = "NetworkingFeature"
     case openCCExt = "OpenCCExt"
+    case osLogExt = "OSLogExt"
     case parserFeature = "ParserFeature"
     case quickSearchFeature = "QuickSearchFeature"
     case readingFeature = "ReadingFeature"
@@ -110,7 +109,6 @@ enum Module: String {
     case searchFeature = "SearchFeature"
     case settingFeature = "SettingFeature"
     case swiftUINavigationExt = "SwiftUINavigationExt"
-    case swiftyBeaverExt = "SwiftyBeaverExt"
     case ttProgressHUDExt = "TTProgressHUDExt"
     case tagTranslationFeature = "TagTranslationFeature"
     case urlClient = "URLClient"
@@ -122,6 +120,7 @@ enum Module: String {
     // Test targets
     case parserFeatureTests = "ParserFeatureTests"
     case downloadsFeatureTests = "DownloadsFeatureTests"
+    case settingFeatureTests = "SettingFeatureTests"
 }
 
 extension Module {
@@ -280,9 +279,9 @@ let targets: [PackageDescription.Target] = [
             .module(.homeFeature),
             .module(.imageClient),
             .module(.libraryClient),
-            .module(.loggerClient),
             .module(.migrationFeature),
             .module(.networkingFeature),
+            .module(.osLogExt),
             .module(.parserFeature),
             .module(.quickSearchFeature),
             .module(.readingFeature),
@@ -291,7 +290,6 @@ let targets: [PackageDescription.Target] = [
             .module(.animatedImageFeature),
             .module(.settingFeature),
             .module(.swiftUINavigationExt),
-            .module(.swiftyBeaverExt),
             .module(.ttProgressHUDExt),
             .module(.urlClient),
             .module(.userDefaultsClient),
@@ -309,7 +307,6 @@ let targets: [PackageDescription.Target] = [
             .targetDependency(.sfSafeSymbols),
             .targetDependency(.swiftUINavigation),
             .targetDependency(.swiftUIPager),
-            .targetDependency(.swiftyBeaver),
             .targetDependency(.ttProgressHUD),
             .targetDependency(.uiImageColors),
             .targetDependency(.waterfallGrid)
@@ -322,7 +319,7 @@ let targets: [PackageDescription.Target] = [
         dependencies: [
             .module(.appTools),
             .module(.resources),
-            .module(.swiftyBeaverExt),
+            .module(.osLogExt),
             .targetDependency(.casePaths)
         ],
         swiftSettings: sharedSwiftSettings,
@@ -359,10 +356,10 @@ let targets: [PackageDescription.Target] = [
             .module(.databaseClient),
             .module(.libraryClient),
             .module(.networkingFeature),
+            .module(.osLogExt),
             .module(.parserFeature),
             .module(.resources),
             .module(.animatedImageFeature),
-            .module(.swiftyBeaverExt),
             .module(.urlClient),
             .targetDependency(.composableArchitecture),
             .targetDependency(.kanna)
@@ -401,9 +398,7 @@ let targets: [PackageDescription.Target] = [
     ),
     .target(
         module: .appTools,
-        dependencies: [
-            .module(.swiftyBeaverExt)
-        ],
+        dependencies: [],
         swiftSettings: sharedSwiftSettings,
         plugins: swiftLintPlugins
     ),
@@ -438,7 +433,7 @@ let targets: [PackageDescription.Target] = [
         module: .backgroundProcessingClient,
         dependencies: [
             .module(.appModels),
-            .module(.swiftyBeaverExt),
+            .module(.osLogExt),
             .targetDependency(.composableArchitecture)
         ],
         swiftSettings: sharedSwiftSettings,
@@ -480,8 +475,8 @@ let targets: [PackageDescription.Target] = [
             .module(.appModels),
             .module(.appTools),
             .module(.openCCExt),
+            .module(.osLogExt),
             .module(.parserFeature),
-            .module(.swiftyBeaverExt),
             .targetDependency(.composableArchitecture),
             .targetDependency(.deprecatedAPI),
             .targetDependency(.kanna)
@@ -494,7 +489,7 @@ let targets: [PackageDescription.Target] = [
         dependencies: [
             .module(.appModels),
             .module(.appTools),
-            .module(.swiftyBeaverExt),
+            .module(.osLogExt),
             .targetDependency(.composableArchitecture)
         ],
         resources: [.process(.resources)],
@@ -579,9 +574,20 @@ let targets: [PackageDescription.Target] = [
         plugins: swiftLintPlugins
     ),
     .target(
-        module: .swiftyBeaverExt,
+        module: .osLogExt,
+        dependencies: [
+            .module(.appTools)
+        ],
+        swiftSettings: sharedSwiftSettings,
+        plugins: swiftLintPlugins
+    ),
+    .target(
+        module: .logsClient,
         dependencies: [
-            .targetDependency(.swiftyBeaver)
+            .module(.appModels),
+            .module(.appTools),
+            .module(.osLogExt),
+            .targetDependency(.composableArchitecture)
         ],
         swiftSettings: sharedSwiftSettings,
         plugins: swiftLintPlugins
@@ -721,12 +727,12 @@ let targets: [PackageDescription.Target] = [
             .module(.fileClient),
             .module(.hapticsClient),
             .module(.libraryClient),
-            .module(.loggerClient),
+            .module(.logsClient),
             .module(.networkingFeature),
+            .module(.osLogExt),
             .module(.readingSettingFeature),
             .module(.resources),
             .module(.swiftUINavigationExt),
-            .module(.swiftyBeaverExt),
             .module(.ttProgressHUDExt),
             .module(.userDefaultsClient),
             .targetDependency(.composableArchitecture),
@@ -842,11 +848,11 @@ let targets: [PackageDescription.Target] = [
             .module(.hapticsClient),
             .module(.imageClient),
             .module(.networkingFeature),
+            .module(.osLogExt),
             .module(.readingSettingFeature),
             .module(.resources),
             .module(.animatedImageFeature),
             .module(.swiftUINavigationExt),
-            .module(.swiftyBeaverExt),
             .module(.ttProgressHUDExt),
             .module(.urlClient),
             .targetDependency(.composableArchitecture),
@@ -880,29 +886,18 @@ let targets: [PackageDescription.Target] = [
             .targetDependency(.kingfisher),
             .targetDependency(.sdWebImageSwiftUI),
             .targetDependency(.sdWebImageWebPCoder),
-            .targetDependency(.swiftyBeaver),
             .targetDependency(.uiImageColors)
         ],
         swiftSettings: sharedSwiftSettings,
         plugins: swiftLintPlugins
     ),
-    .target(
-        module: .loggerClient,
-        dependencies: [
-            .module(.appModels),
-            .module(.swiftyBeaverExt),
-            .targetDependency(.composableArchitecture)
-        ],
-        swiftSettings: sharedSwiftSettings,
-        plugins: swiftLintPlugins
-    ),
     .target(
         module: .parserFeature,
         dependencies: [
             .module(.appModels),
             .module(.appTools),
             .module(.resources),
-            .module(.swiftyBeaverExt),
+            .module(.osLogExt),
             .targetDependency(.kanna)
         ],
         swiftSettings: sharedSwiftSettings,
@@ -988,7 +983,6 @@ let targets: [PackageDescription.Target] = [
             .module(.hapticsClient),
             .module(.imageClient),
             .module(.libraryClient),
-            .module(.loggerClient),
             .module(.networkingFeature),
             .module(.readingFeature),
             .module(.urlClient),
@@ -999,6 +993,17 @@ let targets: [PackageDescription.Target] = [
         ],
         swiftSettings: sharedSwiftSettings,
         plugins: swiftLintPlugins
+    ),
+    .testTarget(
+        module: .settingFeatureTests,
+        dependencies: [
+            .module(.appModels),
+            .module(.logsClient),
+            .module(.settingFeature),
+            .targetDependency(.composableArchitecture)
+        ],
+        swiftSettings: sharedSwiftSettings,
+        plugins: swiftLintPlugins
     )
 ]
 

AppPackage/Sources/AppComponents/TagCloudView.swift

@@ -1,6 +1,3 @@
-//  Copied from https://stackoverflow.com/questions/62102647/
-//
-
 import SwiftUI
 import SFSafeSymbols
 import Kingfisher

AppPackage/Sources/AppFeature/DataFlow/AppDelegateReducer.swift

@@ -1,7 +1,6 @@
 import AppModels
 import SwiftUI
 import BackgroundTasks
-import SwiftyBeaver
 import ComposableArchitecture
 import AppTools
 import AppDelegateClient
@@ -11,6 +10,9 @@ import DownloadClient
 import BackgroundProcessingClient
 import CookieClient
 import MigrationFeature
+import OSLogExt
+
+private let logger = Logger(category: .init(describing: AppDelegateReducer.self))
 
 @Reducer
 struct AppDelegateReducer {
@@ -35,7 +37,6 @@ struct AppDelegateReducer {
             switch action {
             case .onLaunchFinish:
                 return .merge(
-                    .run(operation: { _ in libraryClient.initializeLogger() }),
                     .run(operation: { _ in libraryClient.initializeWebImage() }),
                     .run(operation: { _ in cookieClient.removeYay() }),
                     .run(operation: { _ in cookieClient.syncExCookies() }),
@@ -92,13 +93,15 @@ public class AppDelegate: UIResponder, UIApplicationDelegate {
         @Dependency(\.backgroundProcessingClient) var backgroundProcessingClient
 
         let work = Task { @MainActor in
+            logger.notice("Background processing started.")
             await downloadClient.runBackgroundProcessing()
             // Reschedule only if we stopped on our own with work still pending; an
             // expiration cancels this task and reschedules from its own handler.
             if !Task.isCancelled, await downloadClient.hasPendingWork() {
                 backgroundProcessingClient.schedule()
             }
             task.setTaskCompleted(success: !Task.isCancelled)
+            logger.notice("Background processing finished, cancelled: \(Task.isCancelled, privacy: .public).")
         }
         task.expirationHandler = {
             work.cancel()