diff --git a/AutomergeUniffi/automerge.swift b/AutomergeUniffi/automerge.swift index f9fdb479..698707ea 100644 --- a/AutomergeUniffi/automerge.swift +++ b/AutomergeUniffi/automerge.swift @@ -416,10 +416,10 @@ public protocol DocProtocol: AnyObject { func applyEncodedChangesWithPatches(changes: [UInt8]) throws -> [Patch] - func changes() -> [ChangeHash] - func changeByHash(hash: ChangeHash) -> Change? + func changes() -> [ChangeHash] + func commitWith(msg: String?, time: Int64) func cursor(obj: ObjId, position: UInt64) throws -> Cursor @@ -525,7 +525,6 @@ public protocol DocProtocol: AnyObject { func values(obj: ObjId) throws -> [Value] func valuesAt(obj: ObjId, heads: [ChangeHash]) throws -> [Value] - } public class Doc: @@ -607,32 +606,45 @@ public class Doc: ) } - public func changes() -> [ChangeHash] { - try! FfiConverterSequenceTypeChangeHash.lift( + public func changeByHash(hash: ChangeHash) -> Change? { + try! FfiConverterOptionTypeChange.lift( try! rustCall { - uniffi_uniffi_automerge_fn_method_doc_changes( + uniffi_uniffi_automerge_fn_method_doc_change_by_hash( self.uniffiClonePointer(), + + FfiConverterTypeChangeHash.lower(hash), $0 ) } ) } - public func changeByHash(hash: ChangeHash) -> Change? { - try! FfiConverterOptionTypeChange.lift( + public func changes() -> [ChangeHash] { + try! FfiConverterSequenceTypeChangeHash.lift( try! rustCall { - uniffi_uniffi_automerge_fn_method_doc_change_by_hash( + uniffi_uniffi_automerge_fn_method_doc_changes( self.uniffiClonePointer(), - - FfiConverterTypeChangeHash.lower(hash), $0 ) } ) } + public func commitWith(msg: String?, time: Int64) { + try! + rustCall { + uniffi_uniffi_automerge_fn_method_doc_commit_with( + self.uniffiClonePointer(), + + FfiConverterOptionString.lower(msg), + FfiConverterInt64.lower(time), + $0 + ) + } + } + public func cursor(obj: ObjId, position: UInt64) throws -> Cursor { try FfiConverterTypeCursor.lift( rustCallWithError(FfiConverterTypeDocError.lift) { @@ -1238,18 +1250,6 @@ public class Doc: } ) } - public func commitWith(msg: String?, time: Int64) { - try! - rustCall { - uniffi_uniffi_automerge_fn_method_doc_commit_with( - self.uniffiClonePointer(), - - FfiConverterOptionString.lower(msg), - FfiConverterInt64.lower(time), - $0 - ) - } - } public func save() -> [UInt8] { try! FfiConverterSequenceUInt8.lift( diff --git a/Package.swift b/Package.swift index 097e9524..f2c2cc3e 100644 --- a/Package.swift +++ b/Package.swift @@ -57,8 +57,8 @@ if ProcessInfo.processInfo.environment["LOCAL_BUILD"] != nil { } else { FFIbinaryTarget = .binaryTarget( name: "automergeFFI", - url: "https://github.com/automerge/automerge-swift/releases/download/0.5.8/automergeFFI.xcframework.zip", - checksum: "4ba300561b23f403eaedcc4a473fc761d6dd8f7144b838e4f6a38e9d21a11077" + url: "https://github.com/automerge/automerge-swift/releases/download/0.5.9/automergeFFI.xcframework.zip", + checksum: "49aac4ec08887967fd65be48e0deaafcf96130a842cdfb32d3527b6de1f3382d" ) }