Adjust our imports

.changeset/rare-rings-listen.md

@@ -0,0 +1,5 @@
+---
+"@germ-network/atprototypes": patch
+---
+
+adopt swift-libp2p/swift-bases.git

Package.swift

@@ -16,14 +16,15 @@ let package = Package(
 		.library(name: "Mockable", targets: ["Mockable"]),
 	],
 	dependencies: [
-		.package(url: "https://github.com/Jarema/Base32.git", from: "0.10.2"),
+		.package(url: "https://github.com/swift-libp2p/swift-bases.git", from: "0.2.0"),
 		.package(
 			url: "https://github.com/germ-network/GermConvenience.git",
-			from: "0.1.5"
+			from: "0.2.1"
 		),
 		.package(
 			url: "https://github.com/apple/swift-crypto.git",
-			.upToNextMajor(from: "4.2.0")),
+			.upToNextMajor(from: "4.2.0")
+		),
 		.package(url: "https://github.com/apple/swift-http-types.git", from: "1.5.1"),
 		.package(url: "https://github.com/apple/swift-log", from: "1.6.0"),
 	],
@@ -33,8 +34,8 @@ let package = Package(
 		.target(
 			name: "AtprotoTypes",
 			dependencies: [
-				"Base32",
 				"GermConvenience",
+				.product(name: "Base32", package: "swift-bases"),
 				.product(name: "Crypto", package: "swift-crypto"),
 				.product(name: "HTTPTypes", package: "swift-http-types"),
 				.product(name: "Logging", package: "swift-log"),

Sources/AtprotoTypes/Atproto/CID.swift

@@ -31,17 +31,13 @@ extension Atproto {
 				throw Atproto.Errors.invalidBase32Data
 			}
 
-			guard let decoded = body.base32DecodedData else {
-				throw Atproto.Errors.invalidBase32Data
-			}
-
-			bytes = decoded
+			bytes = try Base32.decode(body)
 		}
 
 		public var string: String {
 			// CID is DASL-compatible (https://atproto.com/specs/data-model)
 			// and DASL CID uses lowercase base-32 (https://dasl.ing/cid.html)
-			"b" + bytes.base32EncodedStringNoPadding.lowercased()
+			"b" + Base32.encode(bytes, options: .letterCase(.lower), .pad(false))
 		}
 	}
 }

Sources/AtprotoTypes/Primitives/Blob.swift

@@ -29,7 +29,7 @@ extension Atproto.Primitive {
 
 		/// The size of the blob.
 		public let size: Int
-		
+
 		public init(
 			ref: Atproto.Primitive.Link,
 			mimeType: String,

Sources/AtprotoTypes/Primitives/Link.swift

@@ -12,7 +12,7 @@ import Foundation
 extension Atproto.Primitive {
 	public struct Link: Sendable, Codable, Equatable {
 		public let link: Atproto.CID
-		
+
 		public init(link: Atproto.CID) {
 			self.link = link
 		}

Sources/AtprotoTypes/XRPC/ResponseParsing.swift

@@ -7,7 +7,8 @@
 
 import Foundation
 import GermConvenience
-import HTTPTypes
+
+import struct HTTPTypes.HTTPResponse
 
 extension Atproto.XRPC {
 	public protocol ResponseParsing: Sendable {