chore: rename WireLogging to WireLegacyLogging - WPB-14876

WireAnalytics/Package.swift

@@ -30,6 +30,7 @@ let package = Package(
             dependencies: [
                 .product(name: "WireFoundation", package: "WireFoundation"),
                 .product(name: "WireLogging", package: "WireLogging"),
+                .product(name: "WireLegacyLogging", package: "WireLogging")
             ]
         ),
         .target(
@@ -50,7 +51,10 @@ let package = Package(
 
         .target(
             name: "WireDatadog",
-            dependencies: datadogDependencies() + ["WireLogging"],
+            dependencies: datadogDependencies() + [
+                "WireLogging",
+                .product(name: "WireLegacyLogging", package: "WireLogging")
+            ],
             sources: datadogFiles()
         ),
 
@@ -101,9 +105,9 @@ func datadogDependencies() -> [Target.Dependency] {
 
 func datadogFiles() -> [String] {
     if isDatadogEnabled {
-        ["WireDatadog.swift"]
+        ["WireDatadog.swift", "WireLegacyLogging.swift"]
     } else {
-        ["WireFakeDatadog.swift"]
+        ["WireFakeDatadog.swift", "WireLegacyLogging.swift"]
     }
 }
 

WireAnalytics/Sources/WireAnalytics/WireLegacyLogging.swift

@@ -0,0 +1,21 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+import WireLegacyLogging
+
+typealias WireLogger = WireLegacyLogging.WireLogger

WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift

@@ -0,0 +1,21 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+public import WireLegacyLogging
+
+public typealias WireLogger = WireLegacyLogging.WireLogger

WireAuthentication/Package.swift

@@ -63,7 +63,7 @@ let package = Package(
         .target(
             name: "WireAuthenticationUI",
             dependencies: [
-                "WireLogging",
+                .product(name: "WireLegacyLogging", package: "WireLogging"),
                 "WireFoundation",
                 "WireAuthenticationAPI",
                 .product(name: "WireDesign", package: "WireUI"),

WireAuthentication/Sources/WireAuthenticationLogic/WireLegacyLogging.swift

@@ -0,0 +1,21 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+public import WireLegacyLogging
+
+public typealias WireLogger = WireLegacyLogging.WireLogger

WireAuthentication/Sources/WireAuthenticationUI/WireLegacyLogging.swift

@@ -0,0 +1,21 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+public import WireLegacyLogging
+
+public typealias WireLogger = WireLegacyLogging.WireLogger

WireBackup/Package.swift

@@ -22,6 +22,7 @@ let package = Package(
                 "KaliumBackup",
                 "WireFoundation",
                 "WireLogging",
+                .product(name: "WireLegacyLogging", package: "WireLogging"),
                 .product(name: "WireUtilitiesPackage", package: "WireFoundation")
             ]
         ),

WireBackup/Sources/WireBackup/WireLegacyLogging.swift

@@ -0,0 +1,22 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+public import WireLegacyLogging
+
+public typealias WireLogger = WireLegacyLogging.WireLogger
+public typealias LoggerProtocol = WireLegacyLogging.LoggerProtocol

WireCalling/Package.swift

@@ -24,7 +24,7 @@ let package = Package(
             name: "WireCallingDomain",
             dependencies: [
                 "WireFoundation",
-                "WireLogging"
+                .product(name: "WireLegacyLogging", package: "WireLogging")
             ]
         ),
         .target(
@@ -39,7 +39,7 @@ let package = Package(
             name: "WireCallingData",
             dependencies: [
                 "WireCallingDomain",
-                "WireLogging"
+                .product(name: "WireLegacyLogging", package: "WireLogging")
             ]
         ),
         .target(

WireDomain/Package.swift

@@ -23,7 +23,7 @@ let package = Package(
             name: "WireDomainPackage",
             dependencies: [
                 "WireNetwork",
-                "WireLogging",
+                .product(name: "WireLegacyLogging", package: "WireLogging"),
                 "WireFoundation"
             ]
         ),

WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift

@@ -85,7 +85,7 @@ public struct IncrementalSyncV2: LiveSyncProtocol {
         self.createPushChannelState = createPushChannelState
     }
 
-    private var logAttributes: WireLogging.LogAttributes {
+    private var logAttributes: LogAttributes {
         .incrementalSyncV3
     }
 

WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift

@@ -65,7 +65,7 @@ public struct PullPendingUpdateEventsSyncV2: PullPendingUpdateEventsSyncV2Protoc
         self.syncMarkerGenerator = syncMarkerGenerator
     }
 
-    private var logAttributes: WireLogging.LogAttributes {
+    private var logAttributes: LogAttributes {
         .incrementalSyncV3 + .newNSE
     }
 

WireDomain/Sources/WireDomain/WireLegacyLogging.swift

@@ -0,0 +1,24 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+import WireLegacyLogging
+
+typealias Flow = WireLegacyLogging.Flow
+typealias WireLogger = WireLegacyLogging.WireLogger
+typealias LogAttributes = WireLegacyLogging.LogAttributes
+typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey

WireDomain/WireDomain Project.xcodeproj/project.pbxproj

@@ -19,7 +19,7 @@
 		59202AD22D54D3D500143413 /* WireDomainPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 59202AD12D54D3D500143413 /* WireDomainPackage */; };
 		598D042D2C89C63100B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D042C2C89C63100B64D71 /* WireFoundation */; };
 		59DBDE982D395BB50069C64C /* WireDomainPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 59DBDE972D395BB50069C64C /* WireDomainPackage */; };
-		59EA774F2D00CE0C002CA0B8 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59EA774E2D00CE0C002CA0B8 /* WireLogging */; };
+		59EA774F2D00CE0C002CA0B8 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59EA774E2D00CE0C002CA0B8 /* WireLegacyLogging */; };
 		C91D188E2D7212FC00B63B66 /* NeedleFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = C91D188D2D7212FC00B63B66 /* NeedleFoundation */; };
 		C97BCCAA2C98704B004F2D0D /* WireDomain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01D0DCA62C1C8C870076CB1C /* WireDomain.framework */; };
 		C9B4C1F72D4915F10072A0EE /* WireCrypto in Frameworks */ = {isa = PBXBuildFile; productRef = C9B4C1F62D4915F10072A0EE /* WireCrypto */; };
@@ -119,7 +119,7 @@
 				C91D188E2D7212FC00B63B66 /* NeedleFoundation in Frameworks */,
 				59DBDE982D395BB50069C64C /* WireDomainPackage in Frameworks */,
 				591B6E452C8B09BA009F8A7B /* WireDataModel.framework in Frameworks */,
-				59EA774F2D00CE0C002CA0B8 /* WireLogging in Frameworks */,
+				59EA774F2D00CE0C002CA0B8 /* WireLegacyLogging in Frameworks */,
 				C9B4C1F72D4915F10072A0EE /* WireCrypto in Frameworks */,
 				01D0DCC62C1C8CD90076CB1C /* WireTransport.framework in Frameworks */,
 			);
@@ -248,7 +248,7 @@
 			name = WireDomain;
 			packageProductDependencies = (
 				598D042C2C89C63100B64D71 /* WireFoundation */,
-				59EA774E2D00CE0C002CA0B8 /* WireLogging */,
+				59EA774E2D00CE0C002CA0B8 /* WireLegacyLogging */,
 				C9B4C1F62D4915F10072A0EE /* WireCrypto */,
 				59DBDE972D395BB50069C64C /* WireDomainPackage */,
 				C91D188D2D7212FC00B63B66 /* NeedleFoundation */,
@@ -968,9 +968,9 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = WireDomainPackage;
 		};
-		59EA774E2D00CE0C002CA0B8 /* WireLogging */ = {
+		59EA774E2D00CE0C002CA0B8 /* WireLegacyLogging */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = WireLogging;
+			productName = WireLegacyLogging;
 		};
 		C91D188D2D7212FC00B63B66 /* NeedleFoundation */ = {
 			isa = XCSwiftPackageProductDependency;

WireLogging/Package.swift

@@ -8,21 +8,39 @@ let package = Package(
     platforms: [.iOS("16.4"), .macOS(.v12)],
     products: [
         .library(name: "WireLogging", targets: ["WireLogging"]),
-        .library(name: "WireLoggingSupport", targets: ["WireLoggingSupport"])
+        .library(name: "WireLoggingSupport", targets: ["WireLoggingSupport"]),
+        .library(name: "WireLegacyLogging", targets: ["WireLegacyLogging"]),
+        .library(name: "WireLegacyLoggingSupport", targets: ["WireLegacyLoggingSupport"])
     ],
     dependencies: [
+        .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"),
         .package(path: "../WirePlugins")
     ],
     targets: [
         .target(name: "WireLogging"),
         .target(
             name: "WireLoggingSupport",
             dependencies: ["WireLogging"],
-            plugins: [.plugin(name: "SourceryPlugin", package: "WirePlugins")]
+            plugins: [
+                .plugin(name: "SourceryPlugin", package: "WirePlugins")
+            ]
         ),
         .testTarget(
             name: "WireLoggingTests",
-            dependencies: ["WireLogging"]
+            dependencies: ["WireLogging", "WireLoggingSupport"]
+        ),
+
+        .target(name: "WireLegacyLogging"),
+        .target(
+            name: "WireLegacyLoggingSupport",
+            dependencies: ["WireLegacyLogging"],
+            plugins: [
+                .plugin(name: "SourceryPlugin", package: "WirePlugins")
+            ]
+        ),
+        .testTarget(
+            name: "WireLegacyLoggingTests",
+            dependencies: ["WireLegacyLogging"]
         )
     ]
 )

WireLogging/Sources/WireLogging/AggregatedLogger.swift → WireLogging/Sources/WireLegacyLogging/AggregatedLogger.swift

@@ -79,4 +79,5 @@ final class AggregatedLogger: LoggerProtocol {
             $0.addTag(key, value: value)
         }
     }
+
 }

WireLogging/Sources/WireLogging/LogAttributes.swift → WireLogging/Sources/WireLegacyLogging/LogAttributes.swift

@@ -52,14 +52,20 @@ public enum LogAttributesKey: String, Comparable, Sendable {
     public static func < (lhs: LogAttributesKey, rhs: LogAttributesKey) -> Bool {
         lhs.rawValue < rhs.rawValue
     }
+
 }
 
 public extension LogAttributes {
+
     static let safePublic = [LogAttributesKey.public: true]
+
     /// PushChannelV2 (consumable notications sync)
     static let pushChannelV2 = [LogAttributesKey.pushChannelVersion: "v2"]
+
     /// PushChannel V1 (regular sync)
     static let pushChannelV1 = [LogAttributesKey.pushChannelVersion: "v1"]
+
     /// legacy pushChannel (Starscream)
     static let pushChannelV0 = [LogAttributesKey.pushChannelVersion: "v0"]
+
 }

WireLogging/Sources/WireLogging/LoggerProtocol.swift → WireLogging/Sources/WireLegacyLogging/LoggerProtocol.swift

@@ -27,6 +27,7 @@ public protocol LoggerProtocol {
 
     /// Add an attribute, value to each logs - DataDog only
     func addTag(_ key: LogAttributesKey, value: String?)
+
 }
 
 public extension LoggerProtocol {
@@ -35,8 +36,8 @@ public extension LoggerProtocol {
         var logAttributes = attributes
 
         // drop attributes used for visibility and category
-        logAttributes.removeValue(forKey: LogAttributesKey.public)
-        logAttributes.removeValue(forKey: LogAttributesKey.tag)
+        logAttributes.removeValue(forKey: .public)
+        logAttributes.removeValue(forKey: .tag)
 
         guard !logAttributes.isEmpty else {
             return ""

WireLogging/Sources/WireLogging/SystemLogger.swift → WireLogging/Sources/WireLegacyLogging/SystemLogger.swift

@@ -87,4 +87,5 @@ public class SystemLogger: LoggerProtocol {
             os_log(osLogType, log: logger, "\(finalMessage)")
         #endif
     }
+
 }

WireLogging/Sources/WireLegacyLoggingSupport/Sourcery/AutoMockable.stencil

@@ -0,0 +1 @@
+../../../../WirePlugins/Plugins/SourceryPlugin/Stencils/AutoMockable.stencil

WireLogging/Sources/WireLegacyLoggingSupport/Sourcery/sourcery.yml

@@ -0,0 +1,8 @@
+sources:
+- ${PACKAGE_ROOT_DIR}/Sources/WireLegacyLogging
+templates:
+- ${TARGET_DIR}/Sourcery/AutoMockable.stencil
+output:
+  ${DERIVED_SOURCES_DIR}
+args:
+  autoMockablePublicImports: ["Foundation", "WireLegacyLogging"]

WireLogging/Sources/WireLegacyLoggingSupport/WireLegacyLogging.swift

@@ -0,0 +1,21 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+// This target generates mocks via 'sourcery'. It uses the plugin configured in `Package.swift`.
+// The generated mocks are processed from the sandbox directory and are not visible in the project folder:
+// https://github.com/apple/swift-package-manager/blob/main/Documentation/Plugins.md#implementing-the-build-tool-plugin-script