Skip to content

chore: update dependencies and fix some build warnings #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grdsdev merged 1 commit into from
May 16, 2024
Merged

chore: update dependencies and fix some build warnings #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 56 additions & 62 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,6 @@
import Foundation
import PackageDescription

var dependencies: [Package.Dependency] = [
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.8.1"),
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.0.0"),
.package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-crypto.git", "1.0.0" ..< "4.0.0"),
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.0.0"),
]

var goTrueDependencies: [Target.Dependency] = [
"_Helpers",
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
.product(name: "Crypto", package: "swift-crypto"),
]

#if !os(Windows) && !os(Linux)
dependencies += [
.package(url: "https://github.com/kishikawakatsumi/KeychainAccess", from: "4.2.2"),
]
goTrueDependencies += [
.product(name: "KeychainAccess", package: "KeychainAccess"),
]
#endif

let package = Package(
name: "Supabase",
platforms: [
Expand All @@ -37,17 +14,21 @@ let package = Package(
.tvOS(.v13),
],
products: [
.library(name: "Functions", targets: ["Functions"]),
.library(name: "Auth", targets: ["Auth"]),
.library(name: "Functions", targets: ["Functions"]),
.library(name: "PostgREST", targets: ["PostgREST"]),
.library(name: "Realtime", targets: ["Realtime"]),
.library(name: "Storage", targets: ["Storage"]),
.library(
name: "Supabase",
targets: ["Supabase", "Functions", "PostgREST", "Auth", "Realtime", "Storage"]
),
.library(name: "Supabase", targets: ["Supabase", "Functions", "PostgREST", "Auth", "Realtime", "Storage"]),
],
dependencies: [
.package(url: "https://github.com/apple/swift-crypto.git", "1.0.0" ..< "4.0.0"),
.package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"),
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.0.0"),
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.8.1"),
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.0.0"),
.package(url: "https://github.com/kishikawakatsumi/KeychainAccess", from: "4.2.2"),
],
dependencies: dependencies,
targets: [
.target(
name: "_Helpers",
Expand All @@ -58,53 +39,66 @@ let package = Package(
.testTarget(
name: "_HelpersTests",
dependencies: [
"_Helpers",
.product(name: "CustomDump", package: "swift-custom-dump"),
"_Helpers",
]
),
.target(name: "Functions", dependencies: ["_Helpers"]),
.testTarget(
name: "FunctionsTests",
.target(
name: "Auth",
dependencies: [
"Functions",
"TestHelpers",
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
.product(name: "Crypto", package: "swift-crypto"),
.product(
name: "KeychainAccess",
package: "KeychainAccess",
condition: .when(
platforms: [.macOS, .iOS, .macCatalyst, .visionOS, .tvOS, .watchOS]
)
),
"_Helpers",
]
),
.testTarget(
name: "IntegrationTests",
name: "AuthTests",
dependencies: [
.product(name: "CustomDump", package: "swift-custom-dump"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
"_Helpers",
"Auth",
"TestHelpers",
"PostgREST",
"Realtime",
"Storage",
]
],
exclude: [
"__Snapshots__",
],
resources: [.process("Resources")]
),
.target(
name: "Auth",
dependencies: goTrueDependencies
.target(name: "Functions", dependencies: ["_Helpers"]),
.testTarget(
name: "FunctionsTests",
dependencies: [
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
"Functions",
"TestHelpers",
],
exclude: ["__Snapshots__"]
),
.testTarget(
name: "AuthTests",
name: "IntegrationTests",
dependencies: [
.product(name: "CustomDump", package: "swift-custom-dump"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
"_Helpers",
"Auth",
"PostgREST",
"Realtime",
"Storage",
"TestHelpers",
],
exclude: [
"__Snapshots__",
],
resources: [.process("Resources")]
resources: [.process("Fixtures")]
),
.target(
name: "PostgREST",
Expand All @@ -116,9 +110,9 @@ let package = Package(
.testTarget(
name: "PostgRESTTests",
dependencies: [
"PostgREST",
"_Helpers",
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
"_Helpers",
"PostgREST",
],
exclude: ["__Snapshots__"]
),
Expand All @@ -132,37 +126,37 @@ let package = Package(
.testTarget(
name: "RealtimeTests",
dependencies: [
"Realtime",
.product(name: "CustomDump", package: "swift-custom-dump"),
"PostgREST",
"Realtime",
"TestHelpers",
.product(name: "CustomDump", package: "swift-custom-dump"),
]
),
.target(name: "Storage", dependencies: ["_Helpers"]),
.testTarget(
name: "StorageTests",
dependencies: [
"Storage",
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
.product(name: "CustomDump", package: "swift-custom-dump"),
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
"Storage",
]
),
.target(
name: "Supabase",
dependencies: [
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
"Auth",
"Storage",
"Realtime",
"PostgREST",
"Functions",
"PostgREST",
"Realtime",
"Storage",
]
),
.testTarget(
name: "SupabaseTests",
dependencies: [
"Supabase",
.product(name: "CustomDump", package: "swift-custom-dump"),
"Supabase",
]
),
.target(
Expand Down
14 changes: 8 additions & 6 deletions Sources/Supabase/SupabaseClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,8 @@ public final class SupabaseClient: Sendable {
#if !os(Linux)
/// Create a new client.
/// - Parameters:
/// - supabaseURL: The unique Supabase URL which is supplied when you create a new project in
/// your project dashboard.
/// - supabaseKey: The unique Supabase Key which is supplied when you create a new project in
/// your project dashboard.
/// - supabaseURL: The unique Supabase URL which is supplied when you create a new project in your project dashboard.
/// - supabaseKey: The unique Supabase Key which is supplied when you create a new project in your project dashboard.
public convenience init(supabaseURL: URL, supabaseKey: String) {
self.init(
supabaseURL: supabaseURL,
Expand Down Expand Up @@ -293,8 +291,12 @@ public final class SupabaseClient: Sendable {
}

private func handleTokenChanged(event: AuthChangeEvent, session: Session?) async {
let supportedEvents: [AuthChangeEvent] = [.initialSession, .signedIn, .tokenRefreshed]
guard supportedEvents.contains(event) else { return }
guard [
.initialSession,
.signedIn,
.tokenRefreshed,
.signedOut,
].contains(event) else { return }

realtime.setAuth(session?.accessToken)
await realtimeV2.setAuth(session?.accessToken)
Expand Down
16 changes: 8 additions & 8 deletions supabase-swift.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.