Swift 6 (#16)

* removed platforms section

* bumped swift-tools-version to 6.0

* bumped min dependency versions

* using byteArray instead of bytes

* migrated to swift-testing

* made errors public

* formatting

* Untracked Package.resolved

* Ignore Package.resolved

* moved swift-libp2p deps from major to minor until we reach our first major release

Author: btoms20

.gitignore

@@ -5,6 +5,7 @@
 .index-build/
 .devcontainer/
 /Packages
+Package.resolved
 /*.xcodeproj
 xcuserdata/
 /public

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:6.0
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the swift-libp2p open source project
@@ -17,10 +17,6 @@ import PackageDescription
 
 let package = Package(
     name: "swift-multiaddr",
-    platforms: [
-        .iOS(.v12),
-        .macOS(.v10_14),
-    ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
@@ -31,11 +27,11 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
-        .package(url: "https://github.com/swift-libp2p/swift-varint.git", .upToNextMinor(from: "0.0.1")),
-        .package(url: "https://github.com/swift-libp2p/swift-multicodec.git", .upToNextMinor(from: "0.0.1")),
-        .package(url: "https://github.com/swift-libp2p/swift-multibase.git", .upToNextMinor(from: "0.0.1")),
-        .package(url: "https://github.com/swift-libp2p/swift-multihash.git", .upToNextMinor(from: "0.0.1")),
-        .package(url: "https://github.com/swift-libp2p/swift-cid.git", .upToNextMinor(from: "0.0.1")),
+        .package(url: "https://github.com/swift-libp2p/swift-varint.git", .upToNextMinor(from: "0.2.0")),
+        .package(url: "https://github.com/swift-libp2p/swift-multicodec.git", .upToNextMinor(from: "0.2.0")),
+        .package(url: "https://github.com/swift-libp2p/swift-multibase.git", .upToNextMinor(from: "0.2.0")),
+        .package(url: "https://github.com/swift-libp2p/swift-multihash.git", .upToNextMinor(from: "0.2.0")),
+        .package(url: "https://github.com/swift-libp2p/swift-cid.git", .upToNextMinor(from: "0.2.0")),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

Package.swift

@@ -103,7 +103,7 @@ extension Address {
             return try IPv6.string(for: addressData)
         case .ip6zone:
             guard !addressData.isEmpty else { throw MultiaddrError.parseAddressFail }
-            let varInt = VarInt.uVarInt(addressData.bytes)
+            let varInt = VarInt.uVarInt(addressData.byteArray)
             guard Int(varInt.value) + varInt.bytesRead == addressData.count else {
                 throw MultiaddrError.parseAddressFail
             }
@@ -122,14 +122,14 @@ extension Address {
             return try Onion3.string(for: addressData)
         case .garlic32:
             guard !addressData.isEmpty else { throw MultiaddrError.parseAddressFail }
-            let varInt = VarInt.uVarInt(addressData.bytes)
+            let varInt = VarInt.uVarInt(addressData.byteArray)
             guard Int(varInt.value) + varInt.bytesRead == addressData.count else {
                 throw MultiaddrError.parseAddressFail
             }
             return try Garlic32.string(for: addressData.dropFirst(varInt.bytesRead))
         case .garlic64:
             guard !addressData.isEmpty else { throw MultiaddrError.parseAddressFail }
-            let varInt = VarInt.uVarInt(addressData.bytes)
+            let varInt = VarInt.uVarInt(addressData.byteArray)
             guard Int(varInt.value) + varInt.bytesRead == addressData.count else {
                 throw MultiaddrError.parseAddressFail
             }
@@ -147,7 +147,7 @@ extension Address {
         //    return str
         case .certhash:
             guard !addressData.isEmpty else { throw MultiaddrError.parseAddressFail }
-            let varInt = VarInt.uVarInt(addressData.bytes)
+            let varInt = VarInt.uVarInt(addressData.byteArray)
             guard Int(varInt.value) + varInt.bytesRead == addressData.count else {
                 throw MultiaddrError.parseAddressFail
             }

Sources/Multiaddr/Address.swift

@@ -18,7 +18,7 @@
 
 import Foundation
 
-enum MultiaddrError: Error {
+public enum MultiaddrError: Error {
     case invalidFormat
     case parseAddressFail
     case parseIPv4AddressFail

Sources/Multiaddr/Extensions/Error+Multiaddr.swift

@@ -28,7 +28,7 @@ struct P2P {
     }
 
     static func string(for data: Data) throws -> String {
-        let varInt = uVarInt(data.bytes)
+        let varInt = uVarInt(data.byteArray)
         guard varInt.bytesRead + Int(varInt.value) == data.count else { throw MultiaddrError.invalidFormat }
         return try Multihash(multihash: data.dropFirst(varInt.bytesRead)).b58String
     }