Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let package = Package(
)
],
dependencies: [
.package(url: "https://github.com/GetStream/stream-core-swift.git", exact: "0.4.0")
.package(url: "https://github.com/GetStream/stream-core-swift.git", exact: "0.5.0")
],
targets: [
.target(
Expand Down
13 changes: 13 additions & 0 deletions Sources/StreamFeeds/Extensions/JSON+Extensions.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// Copyright © 2025 Stream.io Inc. All rights reserved.
//

import Foundation

extension JSONDecoder {
static var `default`: JSONDecoder { .streamCore }
}

extension JSONEncoder {
static var `default`: JSONEncoder { .streamCore }
}
3 changes: 1 addition & 2 deletions Sources/StreamFeeds/FeedsClient+Connection.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
//

import Foundation
import StreamCore

extension FeedsClient {
/// When initializing we perform an automatic connection attempt.
Expand Down Expand Up @@ -93,7 +92,7 @@ extension FeedsClient {
eventDecoder: JSONEventDecoder(),
eventNotificationCenter: eventNotificationCenter,
webSocketClientType: .coordinator,
connectURL: url
connectRequest: URLRequest(url: url)
)

webSocketClient.connectionStateDelegate = self
Expand Down
6 changes: 2 additions & 4 deletions Sources/StreamFeeds/FeedsClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

import Combine
import Foundation
import StreamAttachments
import StreamCore

public final class FeedsClient: Sendable {
public let apiKey: APIKey
Expand All @@ -30,7 +28,7 @@ public final class FeedsClient: Sendable {
let webSocketClient = AllocatedUnfairLock<WebSocketClient?>(nil)

let eventsMiddleware = WSEventsMiddleware()
let eventNotificationCenter: EventNotificationCenter
let eventNotificationCenter: DefaultEventNotificationCenter
let stateLayerEventPublisher = StateLayerEventPublisher()

let activitiesRepository: ActivitiesRepository
Expand Down Expand Up @@ -111,7 +109,7 @@ public final class FeedsClient: Sendable {
transport: apiTransport,
middlewares: [defaultParams]
)
eventNotificationCenter = EventNotificationCenter()
eventNotificationCenter = DefaultEventNotificationCenter()
requestEncoder = DefaultRequestEncoder(
baseURL: URL(string: basePath)!,
apiKey: apiKey
Expand Down
7 changes: 5 additions & 2 deletions StreamFeeds.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1620;
LastUpgradeCheck = 1640;
LastUpgradeCheck = 2610;
TargetAttributes = {
845494E12DBA2E7C00211413 = {
CreatedOnToolsVersion = 16.2;
Expand Down Expand Up @@ -414,6 +414,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_VERSION = 6.0;
VALIDATE_PRODUCT = YES;
Expand Down Expand Up @@ -644,6 +645,7 @@
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 6.0;
Expand Down Expand Up @@ -711,6 +713,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_VERSION = 6.0;
VALIDATE_PRODUCT = YES;
Expand Down Expand Up @@ -867,7 +870,7 @@
repositoryURL = "https://github.com/GetStream/stream-core-swift.git";
requirement = {
kind = exactVersion;
version = 0.4.0;
version = 0.5.0;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "2600"
LastUpgradeVersion = "2610"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "2600"
LastUpgradeVersion = "2610"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down