Move RESP inside Redis

adam-fowler · adam-fowler · commit 5c8e68318c04 · 2025-03-31T16:23:43.000+01:00
diff --git a/Package.swift b/Package.swift
@@ -20,7 +20,6 @@ let package = Package(
         .target(
             name: "Redis",
             dependencies: [
-                "RESP",
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "NIOCore", package: "swift-nio"),
                 .product(name: "NIOPosix", package: "swift-nio"),
@@ -31,17 +30,10 @@ let package = Package(
         .target(
             name: "RedisCommands",
             dependencies: [
-                "RESP",
                 "Redis",
                 .product(name: "NIOCore", package: "swift-nio"),
             ]
         ),
-        .target(
-            name: "RESP",
-            dependencies: [
-                .product(name: "NIOCore", package: "swift-nio")
-            ]
-        ),
         .executableTarget(
             name: "RedisCommandsBuilder",
             resources: [.process("Resources")]
@@ -53,7 +45,7 @@ let package = Package(
         .testTarget(
             name: "RESPTests",
             dependencies: [
-                "RESP",
+                "Redis",
                 .product(name: "NIOTestUtils", package: "swift-nio"),
             ]
         ),
diff --git a/Sources/Redis/Connection/RedisConnection.swift b/Sources/Redis/Connection/RedisConnection.swift
@@ -16,7 +16,6 @@ import Logging
 import NIOCore
 import NIOPosix
 import NIOSSL
-import RESP
 
 #if canImport(Network)
 import Network
diff --git a/Sources/Redis/RESP/RESPCommand.swift b/Sources/Redis/RESP/RESPCommand.swift
diff --git a/Sources/Redis/RESP/RESPError.swift b/Sources/Redis/RESP/RESPError.swift
diff --git a/Sources/Redis/RESP/RESPRenderable.swift b/Sources/Redis/RESP/RESPRenderable.swift
diff --git a/Sources/Redis/RESP/RESPToken.swift b/Sources/Redis/RESP/RESPToken.swift
diff --git a/Sources/Redis/RESP/RESPTokenDecoder.swift b/Sources/Redis/RESP/RESPTokenDecoder.swift
diff --git a/Sources/Redis/RESP/RESPTokenRepresentable.swift b/Sources/Redis/RESP/RESPTokenRepresentable.swift
diff --git a/Sources/Redis/RESP/RESPTypeIdentifier.swift b/Sources/Redis/RESP/RESPTypeIdentifier.swift
diff --git a/Sources/Redis/RedisKey.swift b/Sources/Redis/RedisKey.swift
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 import NIOCore
-import RESP
 
 /// Type representing a RedisKey
 public struct RedisKey: RawRepresentable {
diff --git a/Sources/Redis/RedisRenderableHelpers.swift b/Sources/Redis/RedisRenderableHelpers.swift
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 import NIOCore
-import RESP
 
 @usableFromInline
 package struct RedisPureToken: RESPRenderable {
diff --git a/Sources/RedisCommands/BitmapCommands.swift b/Sources/RedisCommands/BitmapCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/ClusterCommands.swift b/Sources/RedisCommands/ClusterCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/ConnectionCommands.swift b/Sources/RedisCommands/ConnectionCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/GenericCommands.swift b/Sources/RedisCommands/GenericCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/GeoCommands.swift b/Sources/RedisCommands/GeoCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/HashCommands.swift b/Sources/RedisCommands/HashCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/HyperloglogCommands.swift b/Sources/RedisCommands/HyperloglogCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/ListCommands.swift b/Sources/RedisCommands/ListCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/PubsubCommands.swift b/Sources/RedisCommands/PubsubCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/ScriptingCommands.swift b/Sources/RedisCommands/ScriptingCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/ServerCommands.swift b/Sources/RedisCommands/ServerCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/SetCommands.swift b/Sources/RedisCommands/SetCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/SortedSetCommands.swift b/Sources/RedisCommands/SortedSetCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/StreamCommands.swift b/Sources/RedisCommands/StreamCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/StringCommands.swift b/Sources/RedisCommands/StringCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommands/TransactionsCommands.swift b/Sources/RedisCommands/TransactionsCommands.swift
@@ -15,7 +15,6 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/RedisCommandsBuilder/RedisCommandsRender.swift b/Sources/RedisCommandsBuilder/RedisCommandsRender.swift
@@ -213,7 +213,6 @@ func renderRedisCommands(_ commands: [String: RedisCommand], replies: RESPReplie
         // This file is autogenerated by RedisCommandsBuilder
 
         import NIOCore
-        import RESP
         import Redis
 
         #if canImport(FoundationEssentials)
diff --git a/Tests/RESPTests/RESPCommandTests.swift b/Tests/RESPTests/RESPCommandTests.swift
@@ -16,7 +16,7 @@ import NIOCore
 import NIOTestUtils
 import Testing
 
-@testable import RESP
+@testable import Redis
 
 struct RESPCommandTests {
     func decode(command: RESPCommand) throws -> [String] {
diff --git a/Tests/RESPTests/RESPTokenTests.swift b/Tests/RESPTests/RESPTokenTests.swift
@@ -16,7 +16,7 @@ import NIOCore
 import NIOTestUtils
 import Testing
 
-@testable import RESP
+@testable import Redis
 
 struct RESPTokenTests {
     @Test
diff --git a/Tests/RedisTests/redisTests.swift b/Tests/RedisTests/redisTests.swift
@@ -14,7 +14,6 @@
 
 import Foundation
 import Logging
-import RESP
 import Redis
 import RedisCommands
 import Testing
