Merge branch 'logging'

Conflicts: Package.resolved
MasterJ93 · Apr 13, 2024 · 0892c60 · 0892c60
2 parents 7d40bad + 4bc2902
commit 0892c60
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -27,15 +27,6 @@
         "version" : "1.5.4"
       }
     },
-    {
-      "identity" : "swift-log-oslog",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/MasterJ93/swift-log-oslog.git",
-      "state" : {
-        "branch" : "master",
-        "revision" : "b3d6886e0e236036f83b5b8966827b707e174e81"
-      }
-    },
     {
       "identity" : "swiftsoup",
       "kind" : "remoteSourceControl",

diff --git a/Package.swift b/Package.swift
@@ -20,7 +20,6 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.7.0"),
-        .package(url: "https://github.com/MasterJ93/swift-log-oslog.git", branch: "master"),
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0")
     ],
@@ -31,7 +30,7 @@ let package = Package(
             name: "ATProtoKit",
           dependencies: [
             "SwiftSoup",
-            "Logging"
+            .product(name: "Logging", package: "swift-log")
         ])
 //        .testTarget(
 //            name: "ATProtoKitTests",