Skip to content

Integrate StreamCore restructure #44

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
merged 6 commits into from
Oct 22, 2025
+23 −6
Merged

Integrate StreamCore restructure #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8553fcd
Integrate StreamCore restructure
laevandus Oct 16, 2025
1f80027
Update Package.swift
laevandus Oct 16, 2025
98bc780
Export all the StreamCore modules
laevandus Oct 16, 2025
667ac39
Remove logger
laevandus Oct 16, 2025
7852675
Use StreamCore 0.4.0
laevandus Oct 21, 2025
1bbe391
Merge branch 'develop' into stream-core-restructure
laevandus Oct 22, 2025
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
6 changes: 4 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ let package = Package(
)
],
dependencies: [
.package(url: "https://github.com/GetStream/stream-core-swift.git", exact: "0.3.0")
.package(url: "https://github.com/GetStream/stream-core-swift.git", exact: "0.4.0")
],
targets: [
.target(
name: "StreamFeeds",
dependencies: [
.product(name: "StreamCore", package: "stream-core-swift")
.product(name: "StreamAttachments", package: "stream-core-swift"),
.product(name: "StreamCore", package: "stream-core-swift"),
.product(name: "StreamOpenAPI", package: "stream-core-swift")
]
),
.testTarget(
Expand Down
6 changes: 6 additions & 0 deletions Sources/StreamFeeds/Extensions/StreamCore+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
//
// Copyright © 2025 Stream.io Inc. All rights reserved.
//

@_exported import StreamAttachments
@_exported import StreamCore
3 changes: 2 additions & 1 deletion Sources/StreamFeeds/FeedsClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

import Combine
import Foundation
@preconcurrency import StreamCore
import StreamAttachments
import StreamCore

public final class FeedsClient: Sendable {
public let apiKey: APIKey
Expand Down
10 changes: 9 additions & 1 deletion StreamFeeds.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
4F0767B52EA0D0BB00E5FD18 /* StreamAttachments in Frameworks */ = {isa = PBXBuildFile; productRef = 4F0767B42EA0D0BB00E5FD18 /* StreamAttachments */; };
82C6B2B02E1D177D00CB3B23 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 82C6B2AF2E1D177D00CB3B23 /* PrivacyInfo.xcprivacy */; };
845494EB2DBA2E7C00211413 /* StreamFeeds.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 845494E22DBA2E7C00211413 /* StreamFeeds.framework */; };
84AA8E642DCA45880030DD7D /* StreamCore in Frameworks */ = {isa = PBXBuildFile; productRef = 84AA8E632DCA45880030DD7D /* StreamCore */; };
Expand Down Expand Up @@ -105,6 +106,7 @@
files = (
84AA8E642DCA45880030DD7D /* StreamCore in Frameworks */,
84B9B53B2E4A9F0300923DD8 /* StreamCore in Frameworks */,
4F0767B52EA0D0BB00E5FD18 /* StreamAttachments in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -190,6 +192,7 @@
packageProductDependencies = (
84AA8E632DCA45880030DD7D /* StreamCore */,
84B9B53A2E4A9F0300923DD8 /* StreamCore */,
4F0767B42EA0D0BB00E5FD18 /* StreamAttachments */,
);
productName = StreamFeeds;
productReference = 845494E22DBA2E7C00211413 /* StreamFeeds.framework */;
Expand Down Expand Up @@ -864,12 +867,17 @@
repositoryURL = "https://github.com/GetStream/stream-core-swift.git";
requirement = {
kind = exactVersion;
version = 0.3.0;
version = 0.4.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
4F0767B42EA0D0BB00E5FD18 /* StreamAttachments */ = {
isa = XCSwiftPackageProductDependency;
package = 84B9B5392E4A9F0300923DD8 /* XCRemoteSwiftPackageReference "stream-core-swift" */;
productName = StreamAttachments;
};
84AA8E632DCA45880030DD7D /* StreamCore */ = {
isa = XCSwiftPackageProductDependency;
productName = StreamCore;
Expand Down
4 changes: 2 additions & 2 deletions Tests/StreamFeedsTests/TestTools/APITransportMock.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import StreamFeeds
final class APITransportMock: DefaultAPITransport {
let responsePayloads = AllocatedUnfairLock<[any Encodable]>([])

func execute(request: StreamCore.Request) async throws -> (Data, URLResponse) {
func execute(request: Request) async throws -> (Data, URLResponse) {
let payload = try responsePayloads.withLock { payloads in
try Self.consumeResponsePayload(for: request, from: &payloads)
}
Expand All @@ -23,7 +23,7 @@ final class APITransportMock: DefaultAPITransport {
return (data, response)
}

private static func consumeResponsePayload(for request: StreamCore.Request, from payloads: inout [any Encodable]) throws -> any Encodable {
private static func consumeResponsePayload(for request: Request, from payloads: inout [any Encodable]) throws -> any Encodable {
let payloadIndex = payloads.firstIndex { payload in
switch payload.self {
case is GetActivityResponse:
Expand Down