diff --git a/Package.swift b/Package.swift index 17fe56ff..46e8af42 100644 --- a/Package.swift +++ b/Package.swift @@ -30,16 +30,16 @@ let package = Package( ], targets: [ .target( - name: "_Helpers", + name: "Helpers", dependencies: [ .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), ] ), .testTarget( - name: "_HelpersTests", + name: "HelpersTests", dependencies: [ .product(name: "CustomDump", package: "swift-custom-dump"), - "_Helpers", + "Helpers", ] ), .target( @@ -47,7 +47,7 @@ let package = Package( dependencies: [ .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), .product(name: "Crypto", package: "swift-crypto"), - "_Helpers", + "Helpers", ] ), .testTarget( @@ -56,7 +56,7 @@ let package = Package( .product(name: "CustomDump", package: "swift-custom-dump"), .product(name: "SnapshotTesting", package: "swift-snapshot-testing"), .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"), - "_Helpers", + "Helpers", "Auth", "TestHelpers", ], @@ -65,7 +65,7 @@ let package = Package( ], resources: [.process("Resources")] ), - .target(name: "Functions", dependencies: ["_Helpers"]), + .target(name: "Functions", dependencies: ["Helpers"]), .testTarget( name: "FunctionsTests", dependencies: [ @@ -83,7 +83,7 @@ let package = Package( .product(name: "CustomDump", package: "swift-custom-dump"), .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"), .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"), - "_Helpers", + "Helpers", "Auth", "PostgREST", "Realtime", @@ -96,14 +96,14 @@ let package = Package( name: "PostgREST", dependencies: [ .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), - "_Helpers", + "Helpers", ] ), .testTarget( name: "PostgRESTTests", dependencies: [ .product(name: "SnapshotTesting", package: "swift-snapshot-testing"), - "_Helpers", + "Helpers", "PostgREST", ], exclude: ["__Snapshots__"] @@ -112,7 +112,7 @@ let package = Package( name: "Realtime", dependencies: [ .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), - "_Helpers", + "Helpers", ] ), .testTarget( @@ -124,7 +124,7 @@ let package = Package( "TestHelpers", ] ), - .target(name: "Storage", dependencies: ["_Helpers"]), + .target(name: "Storage", dependencies: ["Helpers"]), .testTarget( name: "StorageTests", dependencies: [ diff --git a/Sources/Auth/AuthAdmin.swift b/Sources/Auth/AuthAdmin.swift index 4a62565a..45788669 100644 --- a/Sources/Auth/AuthAdmin.swift +++ b/Sources/Auth/AuthAdmin.swift @@ -5,8 +5,8 @@ // Created by Guilherme Souza on 25/01/24. // -import _Helpers import Foundation +import Helpers public struct AuthAdmin: Sendable { var configuration: AuthClient.Configuration { Current.configuration } diff --git a/Sources/Auth/AuthClient.swift b/Sources/Auth/AuthClient.swift index 8eb2a35c..326668b3 100644 --- a/Sources/Auth/AuthClient.swift +++ b/Sources/Auth/AuthClient.swift @@ -1,6 +1,6 @@ -import _Helpers import ConcurrencyExtras import Foundation +import Helpers #if canImport(AuthenticationServices) import AuthenticationServices diff --git a/Sources/Auth/AuthClientConfiguration.swift b/Sources/Auth/AuthClientConfiguration.swift index c472ea15..cf1ebe53 100644 --- a/Sources/Auth/AuthClientConfiguration.swift +++ b/Sources/Auth/AuthClientConfiguration.swift @@ -5,8 +5,8 @@ // Created by Guilherme Souza on 29/04/24. // -import _Helpers import Foundation +import Helpers #if canImport(FoundationNetworking) import FoundationNetworking diff --git a/Sources/Auth/AuthMFA.swift b/Sources/Auth/AuthMFA.swift index 1e22441e..c8d34c73 100644 --- a/Sources/Auth/AuthMFA.swift +++ b/Sources/Auth/AuthMFA.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers /// Contains the full multi-factor authentication API. public struct AuthMFA: Sendable { diff --git a/Sources/Auth/AuthStateChangeListener.swift b/Sources/Auth/AuthStateChangeListener.swift index 5d7dff6e..de5c69a9 100644 --- a/Sources/Auth/AuthStateChangeListener.swift +++ b/Sources/Auth/AuthStateChangeListener.swift @@ -5,9 +5,9 @@ // Created by Guilherme Souza on 17/02/24. // -import _Helpers import ConcurrencyExtras import Foundation +import Helpers /// A listener that can be removed by calling ``AuthStateChangeListenerRegistration/remove()``. /// diff --git a/Sources/Auth/Defaults.swift b/Sources/Auth/Defaults.swift index e39e5bb5..43476fa9 100644 --- a/Sources/Auth/Defaults.swift +++ b/Sources/Auth/Defaults.swift @@ -5,8 +5,8 @@ // Created by Guilherme Souza on 14/12/23. // -import _Helpers import Foundation +import Helpers extension AuthClient.Configuration { private static let dateFormatterWithFractionalSeconds = { () -> ISO8601DateFormatter in diff --git a/Sources/Auth/Deprecated.swift b/Sources/Auth/Deprecated.swift index 3d547e76..46c1da90 100644 --- a/Sources/Auth/Deprecated.swift +++ b/Sources/Auth/Deprecated.swift @@ -5,8 +5,8 @@ // Created by Guilherme Souza on 14/12/23. // -import _Helpers import Foundation +import Helpers #if canImport(FoundationNetworking) import FoundationNetworking diff --git a/Sources/Auth/Internal/APIClient.swift b/Sources/Auth/Internal/APIClient.swift index de417726..b82106eb 100644 --- a/Sources/Auth/Internal/APIClient.swift +++ b/Sources/Auth/Internal/APIClient.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers extension HTTPClient { init(configuration: AuthClient.Configuration) { diff --git a/Sources/Auth/Internal/CodeVerifierStorage.swift b/Sources/Auth/Internal/CodeVerifierStorage.swift index c7784e6a..89b7d11d 100644 --- a/Sources/Auth/Internal/CodeVerifierStorage.swift +++ b/Sources/Auth/Internal/CodeVerifierStorage.swift @@ -1,6 +1,6 @@ -import _Helpers import ConcurrencyExtras import Foundation +import Helpers struct CodeVerifierStorage: Sendable { var get: @Sendable () -> String? diff --git a/Sources/Auth/Internal/Dependencies.swift b/Sources/Auth/Internal/Dependencies.swift index 8c205dab..f13724d5 100644 --- a/Sources/Auth/Internal/Dependencies.swift +++ b/Sources/Auth/Internal/Dependencies.swift @@ -1,6 +1,6 @@ -import _Helpers import ConcurrencyExtras import Foundation +import Helpers struct Dependencies: Sendable { var configuration: AuthClient.Configuration diff --git a/Sources/Auth/Internal/EventEmitter.swift b/Sources/Auth/Internal/EventEmitter.swift index 121e7af4..a2631802 100644 --- a/Sources/Auth/Internal/EventEmitter.swift +++ b/Sources/Auth/Internal/EventEmitter.swift @@ -1,6 +1,6 @@ -import _Helpers import ConcurrencyExtras import Foundation +import Helpers struct AuthStateChangeEventEmitter { static let shared = AuthStateChangeEventEmitter(emitter: .init(initialEvent: nil, emitsLastEventWhenAttaching: false)) diff --git a/Sources/Auth/Internal/Helpers.swift b/Sources/Auth/Internal/Helpers.swift index 36836038..c227d3c5 100644 --- a/Sources/Auth/Internal/Helpers.swift +++ b/Sources/Auth/Internal/Helpers.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers /// Extracts parameters encoded in the URL both in the query and fragment. func extractParams(from url: URL) -> [String: String] { diff --git a/Sources/Auth/Internal/SessionManager.swift b/Sources/Auth/Internal/SessionManager.swift index 15ed6c50..18170f92 100644 --- a/Sources/Auth/Internal/SessionManager.swift +++ b/Sources/Auth/Internal/SessionManager.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers struct SessionManager: Sendable { var session: @Sendable () async throws -> Session diff --git a/Sources/Auth/Internal/SessionStorage.swift b/Sources/Auth/Internal/SessionStorage.swift index 97c7d3cc..827f50aa 100644 --- a/Sources/Auth/Internal/SessionStorage.swift +++ b/Sources/Auth/Internal/SessionStorage.swift @@ -5,8 +5,8 @@ // Created by Guilherme Souza on 24/10/23. // -import _Helpers import Foundation +import Helpers /// A locally stored ``Session``, it contains metadata such as `expirationDate`. struct StoredSession: Codable { diff --git a/Sources/Auth/Types.swift b/Sources/Auth/Types.swift index 0b8eed65..1a46da0d 100644 --- a/Sources/Auth/Types.swift +++ b/Sources/Auth/Types.swift @@ -1,8 +1,8 @@ -import _Helpers import Foundation +import Helpers -public typealias AnyJSON = _Helpers.AnyJSON -public typealias JSONObject = _Helpers.JSONObject +public typealias AnyJSON = Helpers.AnyJSON +public typealias JSONObject = Helpers.JSONObject public enum AuthChangeEvent: String, Sendable { case initialSession = "INITIAL_SESSION" diff --git a/Sources/Functions/FunctionsClient.swift b/Sources/Functions/FunctionsClient.swift index f1b83c64..5066c446 100644 --- a/Sources/Functions/FunctionsClient.swift +++ b/Sources/Functions/FunctionsClient.swift @@ -1,12 +1,12 @@ -import _Helpers import ConcurrencyExtras import Foundation +import Helpers #if canImport(FoundationNetworking) import FoundationNetworking #endif -let version = _Helpers.version +let version = Helpers.version /// An actor representing a client for invoking functions. public final class FunctionsClient: Sendable { diff --git a/Sources/Functions/Types.swift b/Sources/Functions/Types.swift index 1f74b30c..9f515fe5 100644 --- a/Sources/Functions/Types.swift +++ b/Sources/Functions/Types.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers /// An error type representing various errors that can occur while invoking functions. public enum FunctionsError: Error, LocalizedError { diff --git a/Sources/_Helpers/AnyJSON/AnyJSON+Codable.swift b/Sources/Helpers/AnyJSON/AnyJSON+Codable.swift similarity index 100% rename from Sources/_Helpers/AnyJSON/AnyJSON+Codable.swift rename to Sources/Helpers/AnyJSON/AnyJSON+Codable.swift diff --git a/Sources/_Helpers/AnyJSON/AnyJSON.swift b/Sources/Helpers/AnyJSON/AnyJSON.swift similarity index 100% rename from Sources/_Helpers/AnyJSON/AnyJSON.swift rename to Sources/Helpers/AnyJSON/AnyJSON.swift diff --git a/Sources/_Helpers/DateFormatter.swift b/Sources/Helpers/DateFormatter.swift similarity index 100% rename from Sources/_Helpers/DateFormatter.swift rename to Sources/Helpers/DateFormatter.swift diff --git a/Sources/_Helpers/EventEmitter.swift b/Sources/Helpers/EventEmitter.swift similarity index 100% rename from Sources/_Helpers/EventEmitter.swift rename to Sources/Helpers/EventEmitter.swift diff --git a/Sources/_Helpers/FoundationExtensions.swift b/Sources/Helpers/FoundationExtensions.swift similarity index 100% rename from Sources/_Helpers/FoundationExtensions.swift rename to Sources/Helpers/FoundationExtensions.swift diff --git a/Sources/_Helpers/HTTP/HTTPClient.swift b/Sources/Helpers/HTTP/HTTPClient.swift similarity index 100% rename from Sources/_Helpers/HTTP/HTTPClient.swift rename to Sources/Helpers/HTTP/HTTPClient.swift diff --git a/Sources/_Helpers/HTTP/HTTPHeader.swift b/Sources/Helpers/HTTP/HTTPHeader.swift similarity index 100% rename from Sources/_Helpers/HTTP/HTTPHeader.swift rename to Sources/Helpers/HTTP/HTTPHeader.swift diff --git a/Sources/_Helpers/HTTP/HTTPRequest.swift b/Sources/Helpers/HTTP/HTTPRequest.swift similarity index 100% rename from Sources/_Helpers/HTTP/HTTPRequest.swift rename to Sources/Helpers/HTTP/HTTPRequest.swift diff --git a/Sources/_Helpers/HTTP/HTTPResponse.swift b/Sources/Helpers/HTTP/HTTPResponse.swift similarity index 100% rename from Sources/_Helpers/HTTP/HTTPResponse.swift rename to Sources/Helpers/HTTP/HTTPResponse.swift diff --git a/Sources/_Helpers/HTTP/LoggerInterceptor.swift b/Sources/Helpers/HTTP/LoggerInterceptor.swift similarity index 100% rename from Sources/_Helpers/HTTP/LoggerInterceptor.swift rename to Sources/Helpers/HTTP/LoggerInterceptor.swift diff --git a/Sources/_Helpers/HTTP/RetryRequestInterceptor.swift b/Sources/Helpers/HTTP/RetryRequestInterceptor.swift similarity index 100% rename from Sources/_Helpers/HTTP/RetryRequestInterceptor.swift rename to Sources/Helpers/HTTP/RetryRequestInterceptor.swift diff --git a/Sources/_Helpers/Request.swift b/Sources/Helpers/Request.swift similarity index 100% rename from Sources/_Helpers/Request.swift rename to Sources/Helpers/Request.swift diff --git a/Sources/_Helpers/SharedModels/HTTPError.swift b/Sources/Helpers/SharedModels/HTTPError.swift similarity index 100% rename from Sources/_Helpers/SharedModels/HTTPError.swift rename to Sources/Helpers/SharedModels/HTTPError.swift diff --git a/Sources/_Helpers/SharedModels/PostgrestError.swift b/Sources/Helpers/SharedModels/PostgrestError.swift similarity index 100% rename from Sources/_Helpers/SharedModels/PostgrestError.swift rename to Sources/Helpers/SharedModels/PostgrestError.swift diff --git a/Sources/_Helpers/SupabaseLogger.swift b/Sources/Helpers/SupabaseLogger.swift similarity index 100% rename from Sources/_Helpers/SupabaseLogger.swift rename to Sources/Helpers/SupabaseLogger.swift diff --git a/Sources/_Helpers/Task+withTimeout.swift b/Sources/Helpers/Task+withTimeout.swift similarity index 100% rename from Sources/_Helpers/Task+withTimeout.swift rename to Sources/Helpers/Task+withTimeout.swift diff --git a/Sources/_Helpers/TaskLocalHelpers.swift b/Sources/Helpers/TaskLocalHelpers.swift similarity index 100% rename from Sources/_Helpers/TaskLocalHelpers.swift rename to Sources/Helpers/TaskLocalHelpers.swift diff --git a/Sources/_Helpers/URLSession+AsyncAwait.swift b/Sources/Helpers/URLSession+AsyncAwait.swift similarity index 100% rename from Sources/_Helpers/URLSession+AsyncAwait.swift rename to Sources/Helpers/URLSession+AsyncAwait.swift diff --git a/Sources/_Helpers/Version.swift b/Sources/Helpers/Version.swift similarity index 100% rename from Sources/_Helpers/Version.swift rename to Sources/Helpers/Version.swift diff --git a/Sources/PostgREST/Defaults.swift b/Sources/PostgREST/Defaults.swift index ec3c7511..47f9ccda 100644 --- a/Sources/PostgREST/Defaults.swift +++ b/Sources/PostgREST/Defaults.swift @@ -5,10 +5,10 @@ // Created by Guilherme Souza on 14/12/23. // -import _Helpers import Foundation +import Helpers -let version = _Helpers.version +let version = Helpers.version extension PostgrestClient.Configuration { private static let supportedDateFormatters: [ISO8601DateFormatter] = [ diff --git a/Sources/PostgREST/PostgrestBuilder.swift b/Sources/PostgREST/PostgrestBuilder.swift index 3481801f..ca9e8b40 100644 --- a/Sources/PostgREST/PostgrestBuilder.swift +++ b/Sources/PostgREST/PostgrestBuilder.swift @@ -1,6 +1,6 @@ -import _Helpers import ConcurrencyExtras import Foundation +import Helpers #if canImport(FoundationNetworking) import FoundationNetworking diff --git a/Sources/PostgREST/PostgrestClient.swift b/Sources/PostgREST/PostgrestClient.swift index af96ac5d..4fb1b5ba 100644 --- a/Sources/PostgREST/PostgrestClient.swift +++ b/Sources/PostgREST/PostgrestClient.swift @@ -1,10 +1,10 @@ -import _Helpers import ConcurrencyExtras import Foundation +import Helpers -public typealias PostgrestError = _Helpers.PostgrestError -public typealias HTTPError = _Helpers.HTTPError -public typealias AnyJSON = _Helpers.AnyJSON +public typealias PostgrestError = Helpers.PostgrestError +public typealias HTTPError = Helpers.HTTPError +public typealias AnyJSON = Helpers.AnyJSON #if canImport(FoundationNetworking) import FoundationNetworking diff --git a/Sources/PostgREST/PostgrestFilterBuilder.swift b/Sources/PostgREST/PostgrestFilterBuilder.swift index ffe54c01..46ab0696 100644 --- a/Sources/PostgREST/PostgrestFilterBuilder.swift +++ b/Sources/PostgREST/PostgrestFilterBuilder.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers public class PostgrestFilterBuilder: PostgrestTransformBuilder { public enum Operator: String, CaseIterable, Sendable { diff --git a/Sources/PostgREST/PostgrestQueryBuilder.swift b/Sources/PostgREST/PostgrestQueryBuilder.swift index 22be446f..32dffc49 100644 --- a/Sources/PostgREST/PostgrestQueryBuilder.swift +++ b/Sources/PostgREST/PostgrestQueryBuilder.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers public final class PostgrestQueryBuilder: PostgrestBuilder { /// Perform a SELECT query on the table or view. diff --git a/Sources/PostgREST/PostgrestRpcBuilder.swift b/Sources/PostgREST/PostgrestRpcBuilder.swift index 85c0ae56..08d3fa8b 100644 --- a/Sources/PostgREST/PostgrestRpcBuilder.swift +++ b/Sources/PostgREST/PostgrestRpcBuilder.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers struct NoParams: Encodable {} diff --git a/Sources/PostgREST/PostgrestTransformBuilder.swift b/Sources/PostgREST/PostgrestTransformBuilder.swift index b61aa72d..171835ae 100644 --- a/Sources/PostgREST/PostgrestTransformBuilder.swift +++ b/Sources/PostgREST/PostgrestTransformBuilder.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers public class PostgrestTransformBuilder: PostgrestBuilder { /// Perform a SELECT on the query result. diff --git a/Sources/PostgREST/URLQueryRepresentable.swift b/Sources/PostgREST/URLQueryRepresentable.swift index 039b52d0..d6cb1aa5 100644 --- a/Sources/PostgREST/URLQueryRepresentable.swift +++ b/Sources/PostgREST/URLQueryRepresentable.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers /// A type that can fit into the query part of a URL. public protocol URLQueryRepresentable { diff --git a/Sources/Realtime/RealtimeChannel.swift b/Sources/Realtime/RealtimeChannel.swift index e1f1fe24..228c8f12 100644 --- a/Sources/Realtime/RealtimeChannel.swift +++ b/Sources/Realtime/RealtimeChannel.swift @@ -18,9 +18,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -import _Helpers import ConcurrencyExtras import Foundation +import Helpers import Swift /// Container class of bindings to the channel diff --git a/Sources/Realtime/RealtimeClient.swift b/Sources/Realtime/RealtimeClient.swift index 0812be01..6366dc77 100644 --- a/Sources/Realtime/RealtimeClient.swift +++ b/Sources/Realtime/RealtimeClient.swift @@ -18,9 +18,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -import _Helpers import ConcurrencyExtras import Foundation +import Helpers #if canImport(FoundationNetworking) import FoundationNetworking diff --git a/Sources/Realtime/RealtimeMessage.swift b/Sources/Realtime/RealtimeMessage.swift index 994dd0d1..3feb0066 100644 --- a/Sources/Realtime/RealtimeMessage.swift +++ b/Sources/Realtime/RealtimeMessage.swift @@ -18,8 +18,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -import _Helpers import Foundation +import Helpers /// Data that is received from the Server. public struct RealtimeMessage { diff --git a/Sources/Realtime/V2/CallbackManager.swift b/Sources/Realtime/V2/CallbackManager.swift index 1c9aab55..5659aeca 100644 --- a/Sources/Realtime/V2/CallbackManager.swift +++ b/Sources/Realtime/V2/CallbackManager.swift @@ -5,9 +5,9 @@ // Created by Guilherme Souza on 24/12/23. // -import _Helpers import ConcurrencyExtras import Foundation +import Helpers final class CallbackManager: @unchecked Sendable { struct MutableState { diff --git a/Sources/Realtime/V2/PostgresAction.swift b/Sources/Realtime/V2/PostgresAction.swift index ddd44fac..75f9758a 100644 --- a/Sources/Realtime/V2/PostgresAction.swift +++ b/Sources/Realtime/V2/PostgresAction.swift @@ -5,8 +5,8 @@ // Created by Guilherme Souza on 23/12/23. // -import _Helpers import Foundation +import Helpers public struct Column: Equatable, Codable, Sendable { public let name: String diff --git a/Sources/Realtime/V2/PostgresActionData.swift b/Sources/Realtime/V2/PostgresActionData.swift index cca07e54..bf46856d 100644 --- a/Sources/Realtime/V2/PostgresActionData.swift +++ b/Sources/Realtime/V2/PostgresActionData.swift @@ -5,8 +5,8 @@ // Created by Guilherme Souza on 26/12/23. // -import _Helpers import Foundation +import Helpers struct PostgresActionData: Codable { var type: String diff --git a/Sources/Realtime/V2/PresenceAction.swift b/Sources/Realtime/V2/PresenceAction.swift index a9f45f8c..f019ea34 100644 --- a/Sources/Realtime/V2/PresenceAction.swift +++ b/Sources/Realtime/V2/PresenceAction.swift @@ -5,8 +5,8 @@ // Created by Guilherme Souza on 24/12/23. // -import _Helpers import Foundation +import Helpers public struct PresenceV2: Hashable, Sendable { /// The presence reference of the object. diff --git a/Sources/Realtime/V2/PushV2.swift b/Sources/Realtime/V2/PushV2.swift index fbbdfd9b..70a62edd 100644 --- a/Sources/Realtime/V2/PushV2.swift +++ b/Sources/Realtime/V2/PushV2.swift @@ -5,8 +5,8 @@ // Created by Guilherme Souza on 02/01/24. // -import _Helpers import Foundation +import Helpers actor PushV2 { private weak var channel: RealtimeChannelV2? diff --git a/Sources/Realtime/V2/RealtimeChannelV2.swift b/Sources/Realtime/V2/RealtimeChannelV2.swift index f4362269..0df24214 100644 --- a/Sources/Realtime/V2/RealtimeChannelV2.swift +++ b/Sources/Realtime/V2/RealtimeChannelV2.swift @@ -5,9 +5,9 @@ // Created by Guilherme Souza on 26/12/23. // -import _Helpers import ConcurrencyExtras import Foundation +import Helpers public struct RealtimeChannelConfig: Sendable { public var broadcast: BroadcastJoinConfig diff --git a/Sources/Realtime/V2/RealtimeClientV2.swift b/Sources/Realtime/V2/RealtimeClientV2.swift index b4d653bc..08e219d9 100644 --- a/Sources/Realtime/V2/RealtimeClientV2.swift +++ b/Sources/Realtime/V2/RealtimeClientV2.swift @@ -5,15 +5,15 @@ // Created by Guilherme Souza on 26/12/23. // -import _Helpers import ConcurrencyExtras import Foundation +import Helpers #if canImport(FoundationNetworking) import FoundationNetworking #endif -public typealias JSONObject = _Helpers.JSONObject +public typealias JSONObject = Helpers.JSONObject public actor RealtimeClientV2 { @available(*, deprecated, renamed: "RealtimeClientOptions") diff --git a/Sources/Realtime/V2/RealtimeMessageV2.swift b/Sources/Realtime/V2/RealtimeMessageV2.swift index 13227bdd..1bb81c0d 100644 --- a/Sources/Realtime/V2/RealtimeMessageV2.swift +++ b/Sources/Realtime/V2/RealtimeMessageV2.swift @@ -5,8 +5,8 @@ // Created by Guilherme Souza on 11/01/24. // -import _Helpers import Foundation +import Helpers public struct RealtimeMessageV2: Hashable, Codable, Sendable { public let joinRef: String? diff --git a/Sources/Realtime/V2/Types.swift b/Sources/Realtime/V2/Types.swift index 9089b7b2..eeaab64e 100644 --- a/Sources/Realtime/V2/Types.swift +++ b/Sources/Realtime/V2/Types.swift @@ -5,8 +5,8 @@ // Created by Guilherme Souza on 13/05/24. // -import _Helpers import Foundation +import Helpers /// Options for initializing ``RealtimeClientV2``. public struct RealtimeClientOptions: Sendable { diff --git a/Sources/Realtime/V2/WebSocketClient.swift b/Sources/Realtime/V2/WebSocketClient.swift index 9a2b1c36..be624006 100644 --- a/Sources/Realtime/V2/WebSocketClient.swift +++ b/Sources/Realtime/V2/WebSocketClient.swift @@ -5,9 +5,9 @@ // Created by Guilherme Souza on 29/12/23. // -import _Helpers import ConcurrencyExtras import Foundation +import Helpers #if canImport(FoundationNetworking) import FoundationNetworking diff --git a/Sources/Storage/FileObject.swift b/Sources/Storage/FileObject.swift index c6e1102d..d9c102b0 100644 --- a/Sources/Storage/FileObject.swift +++ b/Sources/Storage/FileObject.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers public struct FileObject: Identifiable, Hashable, Codable, Sendable { public var name: String diff --git a/Sources/Storage/StorageApi.swift b/Sources/Storage/StorageApi.swift index 89ceb308..73a98880 100644 --- a/Sources/Storage/StorageApi.swift +++ b/Sources/Storage/StorageApi.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers #if canImport(FoundationNetworking) import FoundationNetworking diff --git a/Sources/Storage/StorageBucketApi.swift b/Sources/Storage/StorageBucketApi.swift index c99f5141..3351be88 100644 --- a/Sources/Storage/StorageBucketApi.swift +++ b/Sources/Storage/StorageBucketApi.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers #if canImport(FoundationNetworking) import FoundationNetworking diff --git a/Sources/Storage/StorageFileApi.swift b/Sources/Storage/StorageFileApi.swift index 300eb0fc..8093464c 100644 --- a/Sources/Storage/StorageFileApi.swift +++ b/Sources/Storage/StorageFileApi.swift @@ -1,5 +1,5 @@ -import _Helpers import Foundation +import Helpers #if canImport(FoundationNetworking) import FoundationNetworking diff --git a/Sources/Storage/SupabaseStorage.swift b/Sources/Storage/SupabaseStorage.swift index 3429520a..b2cad239 100644 --- a/Sources/Storage/SupabaseStorage.swift +++ b/Sources/Storage/SupabaseStorage.swift @@ -1,8 +1,8 @@ -import _Helpers import Foundation +import Helpers -public typealias SupabaseLogger = _Helpers.SupabaseLogger -public typealias SupabaseLogMessage = _Helpers.SupabaseLogMessage +public typealias SupabaseLogger = Helpers.SupabaseLogger +public typealias SupabaseLogMessage = Helpers.SupabaseLogMessage public struct StorageClientConfiguration { public let url: URL diff --git a/Sources/Supabase/SupabaseClient.swift b/Sources/Supabase/SupabaseClient.swift index 90c8df95..744bc861 100644 --- a/Sources/Supabase/SupabaseClient.swift +++ b/Sources/Supabase/SupabaseClient.swift @@ -1,8 +1,8 @@ -import _Helpers @_exported import Auth import ConcurrencyExtras import Foundation @_exported import Functions +import Helpers @_exported import PostgREST @_exported import Realtime @_exported import Storage @@ -11,11 +11,11 @@ import Foundation import FoundationNetworking #endif -public typealias SupabaseLogger = _Helpers.SupabaseLogger -public typealias SupabaseLogLevel = _Helpers.SupabaseLogLevel -public typealias SupabaseLogMessage = _Helpers.SupabaseLogMessage +public typealias SupabaseLogger = Helpers.SupabaseLogger +public typealias SupabaseLogLevel = Helpers.SupabaseLogLevel +public typealias SupabaseLogMessage = Helpers.SupabaseLogMessage -let version = _Helpers.version +let version = Helpers.version /// Supabase Client. public final class SupabaseClient: Sendable { diff --git a/Sources/Supabase/Types.swift b/Sources/Supabase/Types.swift index d980e9f2..188dc38d 100644 --- a/Sources/Supabase/Types.swift +++ b/Sources/Supabase/Types.swift @@ -1,6 +1,6 @@ -import _Helpers import Auth import Foundation +import Helpers import PostgREST import Realtime diff --git a/Sources/TestHelpers/HTTPClientMock.swift b/Sources/TestHelpers/HTTPClientMock.swift index 94714329..0d77c178 100644 --- a/Sources/TestHelpers/HTTPClientMock.swift +++ b/Sources/TestHelpers/HTTPClientMock.swift @@ -5,9 +5,9 @@ // Created by Guilherme Souza on 26/04/24. // -import _Helpers import ConcurrencyExtras import Foundation +import Helpers import XCTestDynamicOverlay package final class HTTPClientMock: HTTPClientType { diff --git a/Tests/AuthTests/AuthClientTests.swift b/Tests/AuthTests/AuthClientTests.swift index 2c78cc44..d1cfa8df 100644 --- a/Tests/AuthTests/AuthClientTests.swift +++ b/Tests/AuthTests/AuthClientTests.swift @@ -5,10 +5,10 @@ // Created by Guilherme Souza on 23/10/23. // -@testable import _Helpers @testable import Auth import ConcurrencyExtras import CustomDump +@testable import Helpers import TestHelpers import XCTest diff --git a/Tests/AuthTests/Mocks/Mocks.swift b/Tests/AuthTests/Mocks/Mocks.swift index ab22ccef..fdd06678 100644 --- a/Tests/AuthTests/Mocks/Mocks.swift +++ b/Tests/AuthTests/Mocks/Mocks.swift @@ -5,9 +5,9 @@ // Created by Guilherme Souza on 27/10/23. // -import _Helpers import ConcurrencyExtras import Foundation +import Helpers import TestHelpers import XCTestDynamicOverlay diff --git a/Tests/AuthTests/RequestsTests.swift b/Tests/AuthTests/RequestsTests.swift index d06ec7b5..d7e81dc0 100644 --- a/Tests/AuthTests/RequestsTests.swift +++ b/Tests/AuthTests/RequestsTests.swift @@ -5,8 +5,8 @@ // Created by Guilherme Souza on 07/10/23. // -import _Helpers @testable import Auth +import Helpers import SnapshotTesting import TestHelpers import XCTest diff --git a/Tests/AuthTests/SessionManagerTests.swift b/Tests/AuthTests/SessionManagerTests.swift index 4d5b13d4..e18b3e1c 100644 --- a/Tests/AuthTests/SessionManagerTests.swift +++ b/Tests/AuthTests/SessionManagerTests.swift @@ -5,10 +5,10 @@ // Created by Guilherme Souza on 23/10/23. // -import _Helpers @testable import Auth import ConcurrencyExtras import CustomDump +import Helpers import TestHelpers import XCTest import XCTestDynamicOverlay diff --git a/Tests/FunctionsTests/FunctionsClientTests.swift b/Tests/FunctionsTests/FunctionsClientTests.swift index fecb93b6..c55ff9de 100644 --- a/Tests/FunctionsTests/FunctionsClientTests.swift +++ b/Tests/FunctionsTests/FunctionsClientTests.swift @@ -1,6 +1,6 @@ -import _Helpers import ConcurrencyExtras @testable import Functions +import Helpers import TestHelpers import XCTest diff --git a/Tests/_HelpersTests/AnyJSONTests.swift b/Tests/HelpersTests/AnyJSONTests.swift similarity index 99% rename from Tests/_HelpersTests/AnyJSONTests.swift rename to Tests/HelpersTests/AnyJSONTests.swift index 248115b6..0c3cabdf 100644 --- a/Tests/_HelpersTests/AnyJSONTests.swift +++ b/Tests/HelpersTests/AnyJSONTests.swift @@ -5,9 +5,9 @@ // Created by Guilherme Souza on 28/12/23. // -@testable import _Helpers import CustomDump import Foundation +@testable import Helpers import XCTest final class AnyJSONTests: XCTestCase { diff --git a/Tests/_HelpersTests/HTTPHeadersTests.swift b/Tests/HelpersTests/HTTPHeadersTests.swift similarity index 98% rename from Tests/_HelpersTests/HTTPHeadersTests.swift rename to Tests/HelpersTests/HTTPHeadersTests.swift index bc2974bc..07bdc2f0 100644 --- a/Tests/_HelpersTests/HTTPHeadersTests.swift +++ b/Tests/HelpersTests/HTTPHeadersTests.swift @@ -5,7 +5,7 @@ // Created by Guilherme Souza on 24/04/24. // -@testable import _Helpers +@testable import Helpers import XCTest final class HTTPHeadersTests: XCTestCase { diff --git a/Tests/_HelpersTests/ObservationTokenTests.swift b/Tests/HelpersTests/ObservationTokenTests.swift similarity index 96% rename from Tests/_HelpersTests/ObservationTokenTests.swift rename to Tests/HelpersTests/ObservationTokenTests.swift index d00eaa1d..a93602ef 100644 --- a/Tests/_HelpersTests/ObservationTokenTests.swift +++ b/Tests/HelpersTests/ObservationTokenTests.swift @@ -5,9 +5,9 @@ // Created by Guilherme Souza on 17/02/24. // -@testable import _Helpers import ConcurrencyExtras import Foundation +@testable import Helpers import XCTest final class ObservationTokenTests: XCTestCase { diff --git a/Tests/_HelpersTests/WithTimeoutTests.swift b/Tests/HelpersTests/WithTimeoutTests.swift similarity index 97% rename from Tests/_HelpersTests/WithTimeoutTests.swift rename to Tests/HelpersTests/WithTimeoutTests.swift index 32e08c8d..e17013e4 100644 --- a/Tests/_HelpersTests/WithTimeoutTests.swift +++ b/Tests/HelpersTests/WithTimeoutTests.swift @@ -5,8 +5,8 @@ // Created by Guilherme Souza on 19/04/24. // -import _Helpers import Foundation +import Helpers import XCTest final class WithTimeoutTests: XCTestCase { diff --git a/Tests/PostgRESTTests/BuildURLRequestTests.swift b/Tests/PostgRESTTests/BuildURLRequestTests.swift index 352610b9..3f8ee515 100644 --- a/Tests/PostgRESTTests/BuildURLRequestTests.swift +++ b/Tests/PostgRESTTests/BuildURLRequestTests.swift @@ -1,6 +1,6 @@ -import _Helpers import ConcurrencyExtras import Foundation +import Helpers import SnapshotTesting import XCTest diff --git a/Tests/RealtimeTests/CallbackManagerTests.swift b/Tests/RealtimeTests/CallbackManagerTests.swift index 93747d95..50cf3874 100644 --- a/Tests/RealtimeTests/CallbackManagerTests.swift +++ b/Tests/RealtimeTests/CallbackManagerTests.swift @@ -5,9 +5,9 @@ // Created by Guilherme Souza on 26/12/23. // -import _Helpers import ConcurrencyExtras import CustomDump +import Helpers @testable import Realtime import XCTest diff --git a/Tests/RealtimeTests/RealtimeTests.swift b/Tests/RealtimeTests/RealtimeTests.swift index f4a1e3c5..4f10051a 100644 --- a/Tests/RealtimeTests/RealtimeTests.swift +++ b/Tests/RealtimeTests/RealtimeTests.swift @@ -1,6 +1,6 @@ -import _Helpers import ConcurrencyExtras import CustomDump +import Helpers @testable import Realtime import TestHelpers import XCTest diff --git a/release-please-config.json b/release-please-config.json index b59d0a7f..5c9a0ea8 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -8,10 +8,10 @@ "prerelease": false, "release-type": "simple", "extra-files": [ - "Sources/_Helpers/Version.swift" + "Sources/Helpers/Version.swift" ] } }, "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", "last-release-sha": "60bd77ac56a40c89bd0de75c5be221187cf7f493" -} \ No newline at end of file +}