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

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

7 changes: 4 additions & 3 deletions Package.resolved

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

5 changes: 2 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@ let package = Package(
// TODO: Unpin before release
.package(
url: "https://github.com/ably/ably-cocoa.git",
revision: "68e9b6fc786f0c2c425d095b3cf3366844fd0507",
revision: "5e4cca89749ec051a57c5758412c080f049fcf42",
),
// TODO: Unpin before release
.package(
url: "https://github.com/ably/ably-cocoa-plugin-support",
revision: "36c529db38154d01537e782f7ed4aa7535fb3237",
from: "2.0.0",
),
.package(
url: "https://github.com/apple/swift-argument-parser",
Expand Down
22 changes: 2 additions & 20 deletions Sources/AblyLiveObjects/Internal/DefaultInternalPlugin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -161,20 +161,7 @@ internal final class DefaultInternalPlugin: NSObject, _AblyPluginSupportPrivate.
// RTO10b
realtimeObjects.nosync_setGarbageCollectionGracePeriod(gracePeriod)

// Push the siteCode from connectionDetails
let siteCode: String? = {
guard let connectionDetails else {
return nil
}

// This is a fallback; our ably-cocoa dependency version should ensure that this is never triggered.
guard (connectionDetails as AnyObject).responds(to: #selector(ConnectionDetailsProtocol.siteCode)) else {
preconditionFailure("ably-cocoa's connectionDetails does not implement siteCode. Please update ably-cocoa to a version that supports apply-on-ACK.")
}

return connectionDetails.siteCode?()
}()
realtimeObjects.nosync_setSiteCode(siteCode)
realtimeObjects.nosync_setSiteCode(connectionDetails?.siteCode)
}

// MARK: - Sending `OBJECT` ProtocolMessage
Expand All @@ -189,12 +176,7 @@ internal final class DefaultInternalPlugin: NSObject, _AblyPluginSupportPrivate.
let objectMessageBoxes: [ObjectMessageBox<OutboundObjectMessage>] = objectMessages.map { .init(objectMessage: $0) }
let internalQueue = pluginAPI.internalQueue(for: client)

// This is a fallback; our ably-cocoa dependency version should ensure that this is never triggered.
guard (pluginAPI as AnyObject).responds(to: #selector(PluginAPIProtocol.nosync_sendObject(withObjectMessages:channel:completionWithResult:))) else {
preconditionFailure("ably-cocoa does not implement nosync_sendObjectWithObjectMessages:channel:completionWithResult:. Please update ably-cocoa to a version that supports apply-on-ACK.")
}

pluginAPI.nosync_sendObject!(
pluginAPI.nosync_sendObject(
withObjectMessages: objectMessageBoxes,
channel: channel,
) { pluginPublishResult, error in
Expand Down
Loading