patch: update discordKit to reference local compiled protos

0ldF0x · Oct 19, 2022 · f7abd99 · f7abd99
1 parent e209871
commit f7abd99
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 17 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -17,15 +17,6 @@
         "revision" : "3303b164430d9a7055ba484c8ead67a52f7b74f6",
         "version" : "1.0.0"
       }
-    },
-    {
-      "identity" : "swift-protobuf",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-protobuf.git",
-      "state" : {
-        "revision" : "88c7d15e1242fdb6ecbafbc7926426a19be1e98a",
-        "version" : "1.20.2"
-      }
     }
   ],
   "version" : 2

diff --git a/Package.swift b/Package.swift
@@ -25,7 +25,6 @@ let package = Package(
                 .product(name: "Reachability", package: "Reachability.swift", condition: .when(platforms: [.macOS])),
                 .product(name: "SwiftProtobuf", package: "swift-protobuf"),
                 .target(name: "DiscordKitCommon"),
-                .target(name: "Protos")
             ],
             exclude: [
                 "REST/README.md",
@@ -40,10 +39,6 @@ let package = Package(
             name: "DiscordKitCommon",
             exclude: ["Objects/README.md"]
         ),
-        .binaryTarget(
-            name: "Protos",
-            path: "./Sources/DIscordKit/protos/Protos.xcframework"
-        ),
         .testTarget(name: "DiscordKitCommonTests", dependencies: ["DiscordKitCommon"])
 	],
     swiftLanguageVersions: [.v5]

diff --git a/Sources/DiscordKit/Extensions/Presence+.swift b/Sources/DiscordKit/Extensions/Presence+.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import DiscordKitCommon
-import Protos
 
 extension Presence {
     init(protoStatus: StatusSettings, id: Snowflake) {

diff --git a/Sources/DiscordKit/Gateway/DiscordGateway.swift b/Sources/DiscordKit/Gateway/DiscordGateway.swift
@@ -9,7 +9,6 @@ import Foundation
 import os
 import DiscordKitCommon
 import DiscordKitCore
-import Protos
 
 /// Higher-level Gateway manager, mainly for handling and dispatching
 /// Gateway events
@@ -293,7 +292,7 @@ public class DiscordGateway: ObservableObject {
         case let (.channelUpdate, channel as Channel):
             cache.replace(channel)
 
-        case let (.messageCreate, message as Message):
+        case let (.messageCreate, message as DiscordKitCommon.Message):
             cache.appendOrReplace(message)
 
         case let (.presenceUpdate, update as PresenceUpdate):