Merge pull request #4 from neothXT/rc/2.0.6

rc 2.0.6

Package.swift

@@ -14,7 +14,7 @@ let package = Package(
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
             name: "SwiftNet",
-            targets: ["SwiftNet", "SwiftNetMacros"])
+            targets: ["SwiftNet", "SNUtilities", "SwiftNetMacros"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -29,18 +29,20 @@ let package = Package(
             dependencies: [
                 .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
                 .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
-                "SwiftNet"
+                "SNUtilities"
             ]
         ),
         .target(
             name: "SwiftNet",
-			exclude: ["../../SwiftNet.podspec"]),
+            dependencies: ["SNUtilities", "SwiftNetMacros"],
+			exclude: ["../../SwiftNet-macroless.podspec"]),
+        .target(name: "SNUtilities"),
+        .target(
+            name: "SwiftNetMacros",
+            dependencies: ["SNMacros", "SNUtilities"]),
         .testTarget(
             name: "SwiftNetTests",
             dependencies: ["SwiftNet", "SwiftNetMacros", "SNMacros"]),
-        .target(
-            name: "SwiftNetMacros",
-            dependencies: ["SNMacros", "SwiftNet"]),
         .testTarget(
             name: "SwiftNetMacrosTests",
             dependencies: [

Sources/SwiftNet/Config/AccessTokenStrategy.swift → Sources/SNUtilities/Authorization/AccessTokenStrategy.swift

@@ -8,7 +8,7 @@
 public enum AccessTokenStrategy {
 	case global, custom(String)
 
-	var storingLabel: String {
+	public var storingLabel: String {
 		switch self {
 		case .global:
 			return "accessToken_SwiftNet"

Sources/SwiftNet/Config/SNConfig + extensions.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 
+
 extension SNConfig {
 	//MARK: set access token methods
 

Sources/SwiftNet/Data/AccessTokenStorage.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 
+
 extension SNConfig {
     fileprivate static var accessTokens: [String: SNAccessToken] = [:]
 }

Sources/SwiftNet/EndpointBuilder/EndpointBuilder.swift

@@ -8,6 +8,7 @@
 import Foundation
 import Combine
 
+
 public protocol EndpointBuilderAbstract {
     associatedtype T: Codable & Equatable
 

Sources/SwiftNet/EndpointBuilder/EndpointModel.swift

@@ -8,6 +8,7 @@
 import Foundation
 import Combine
 
+
 public protocol EndpointModel {
     var identifier: String { get }
     static var defaultAccessTokenStrategy: AccessTokenStrategy { get }

Sources/SwiftNet/Request/AnyPublisher + asAccessTokenConvertible.swift

@@ -8,6 +8,7 @@
 import Foundation
 import Combine
 
+
 extension AnyPublisher {
 	/// Converts publisher to return object responding to AccessTokenConvertible in case of success
 	public func asAccessTokenConvertible() throws -> AnyPublisher<AccessTokenConvertible, Error> {

Sources/SwiftNet/Request/SNProvider.swift

@@ -7,6 +7,8 @@
 
 import Foundation
 @_exported import Combine
+@_exported import SNUtilities
+@_exported import SwiftNetMacros
 
 fileprivate func runOnMain(_ completion: @escaping () -> Void) {
     DispatchQueue.main.async {

Sources/SwiftNetMacros/SwiftNetMacros.swift

@@ -1,7 +1,7 @@
 // The Swift Programming Language
 // https://docs.swift.org/swift-book
 
-import SwiftNet
+import SNUtilities
 
 @attached(member, names: named(url), named(identifier), named(staticIdentifier))
 public macro Endpoint(url: String) = #externalMacro(module: "SNMacros", type: "EndpointMacro")