Skip to content

Commit 3e310f8

Browse files
bitwarden/sdk-internal@72f4866 1.0.0-2394-72f4866 - [PM-20288] Automate iOS repo update and improve release-swift process (bitwarden/sdk-internal#439)
1 parent 8b605c5 commit 3e310f8

File tree

4 files changed

+36
-12
lines changed

4 files changed

+36
-12
lines changed

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ let package = Package(
3030
dependencies: ["BitwardenSdk"]),
3131
.binaryTarget(
3232
name: "BitwardenFFI",
33-
url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-2301-0b6d9c4/BitwardenFFI-1.0.0-0b6d9c4.xcframework.zip",
34-
checksum: "afa916c1e0a3bba10996a694bc0d78729a1112e4d86b06b3725c7b0f0db881d4")
33+
url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-2394-72f4866/BitwardenFFI-1.0.0-72f4866.xcframework.zip",
34+
checksum: "52809b7bd3057a68b70ecefa99646fece101148d5e24000b004d0430989dbf96")
3535
]
3636
)

Sources/BitwardenSdk/BitwardenCollections.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,8 +891,8 @@ private let initializationResult: InitializationResult = {
891891
return InitializationResult.contractVersionMismatch
892892
}
893893

894-
uniffiEnsureBitwardenCryptoInitialized()
895894
uniffiEnsureBitwardenCoreInitialized()
895+
uniffiEnsureBitwardenCryptoInitialized()
896896
return InitializationResult.ok
897897
}()
898898

Sources/BitwardenSdk/BitwardenSDK.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7246,16 +7246,16 @@ private let initializationResult: InitializationResult = {
72467246
uniffiCallbackInitCipherRepository()
72477247
uniffiCallbackInitFido2CredentialStore()
72487248
uniffiCallbackInitFido2UserInterface()
7249+
uniffiEnsureBitwardenSendInitialized()
7250+
uniffiEnsureBitwardenCollectionsInitialized()
72497251
uniffiEnsureBitwardenCryptoInitialized()
72507252
uniffiEnsureBitwardenFidoInitialized()
7253+
uniffiEnsureBitwardenEncodingInitialized()
72517254
uniffiEnsureBitwardenCoreInitialized()
7252-
uniffiEnsureBitwardenCollectionsInitialized()
7253-
uniffiEnsureBitwardenVaultInitialized()
72547255
uniffiEnsureBitwardenExportersInitialized()
72557256
uniffiEnsureBitwardenSshInitialized()
7256-
uniffiEnsureBitwardenEncodingInitialized()
72577257
uniffiEnsureBitwardenGeneratorsInitialized()
7258-
uniffiEnsureBitwardenSendInitialized()
7258+
uniffiEnsureBitwardenVaultInitialized()
72597259
return InitializationResult.ok
72607260
}()
72617261

Sources/BitwardenSdk/BitwardenVault.swift

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,14 +1121,15 @@ public struct Cipher {
11211121
public let creationDate: DateTime
11221122
public let deletedDate: DateTime?
11231123
public let revisionDate: DateTime
1124+
public let archivedDate: DateTime?
11241125

11251126
// Default memberwise initializers are never public by default, so we
11261127
// declare one manually.
11271128
public init(id: CipherId?, organizationId: OrganizationId?, folderId: FolderId?, collectionIds: [CollectionId],
11281129
/**
11291130
* More recent ciphers uses individual encryption keys to encrypt the other fields of the
11301131
* Cipher.
1131-
*/key: EncString?, name: EncString, notes: EncString?, type: CipherType, login: Login?, identity: Identity?, card: Card?, secureNote: SecureNote?, sshKey: SshKey?, favorite: Bool, reprompt: CipherRepromptType, organizationUseTotp: Bool, edit: Bool, permissions: CipherPermissions?, viewPassword: Bool, localData: LocalData?, attachments: [Attachment]?, fields: [Field]?, passwordHistory: [PasswordHistory]?, creationDate: DateTime, deletedDate: DateTime?, revisionDate: DateTime) {
1132+
*/key: EncString?, name: EncString, notes: EncString?, type: CipherType, login: Login?, identity: Identity?, card: Card?, secureNote: SecureNote?, sshKey: SshKey?, favorite: Bool, reprompt: CipherRepromptType, organizationUseTotp: Bool, edit: Bool, permissions: CipherPermissions?, viewPassword: Bool, localData: LocalData?, attachments: [Attachment]?, fields: [Field]?, passwordHistory: [PasswordHistory]?, creationDate: DateTime, deletedDate: DateTime?, revisionDate: DateTime, archivedDate: DateTime?) {
11321133
self.id = id
11331134
self.organizationId = organizationId
11341135
self.folderId = folderId
@@ -1155,6 +1156,7 @@ public struct Cipher {
11551156
self.creationDate = creationDate
11561157
self.deletedDate = deletedDate
11571158
self.revisionDate = revisionDate
1159+
self.archivedDate = archivedDate
11581160
}
11591161
}
11601162

@@ -1243,6 +1245,9 @@ extension Cipher: Equatable, Hashable {
12431245
if lhs.revisionDate != rhs.revisionDate {
12441246
return false
12451247
}
1248+
if lhs.archivedDate != rhs.archivedDate {
1249+
return false
1250+
}
12461251
return true
12471252
}
12481253

@@ -1273,6 +1278,7 @@ extension Cipher: Equatable, Hashable {
12731278
hasher.combine(creationDate)
12741279
hasher.combine(deletedDate)
12751280
hasher.combine(revisionDate)
1281+
hasher.combine(archivedDate)
12761282
}
12771283
}
12781284

@@ -1310,7 +1316,8 @@ public struct FfiConverterTypeCipher: FfiConverterRustBuffer {
13101316
passwordHistory: FfiConverterOptionSequenceTypePasswordHistory.read(from: &buf),
13111317
creationDate: FfiConverterTypeDateTime.read(from: &buf),
13121318
deletedDate: FfiConverterOptionTypeDateTime.read(from: &buf),
1313-
revisionDate: FfiConverterTypeDateTime.read(from: &buf)
1319+
revisionDate: FfiConverterTypeDateTime.read(from: &buf),
1320+
archivedDate: FfiConverterOptionTypeDateTime.read(from: &buf)
13141321
)
13151322
}
13161323

@@ -1341,6 +1348,7 @@ public struct FfiConverterTypeCipher: FfiConverterRustBuffer {
13411348
FfiConverterTypeDateTime.write(value.creationDate, into: &buf)
13421349
FfiConverterOptionTypeDateTime.write(value.deletedDate, into: &buf)
13431350
FfiConverterTypeDateTime.write(value.revisionDate, into: &buf)
1351+
FfiConverterOptionTypeDateTime.write(value.archivedDate, into: &buf)
13441352
}
13451353
}
13461354

@@ -1389,6 +1397,7 @@ public struct CipherListView {
13891397
public let creationDate: DateTime
13901398
public let deletedDate: DateTime?
13911399
public let revisionDate: DateTime
1400+
public let archivedDate: DateTime?
13921401
/**
13931402
* Hints for the presentation layer for which fields can be copied.
13941403
*/
@@ -1406,7 +1415,7 @@ public struct CipherListView {
14061415
*/attachments: UInt32,
14071416
/**
14081417
* Indicates if the cipher has old attachments that need to be re-uploaded
1409-
*/hasOldAttachments: Bool, creationDate: DateTime, deletedDate: DateTime?, revisionDate: DateTime,
1418+
*/hasOldAttachments: Bool, creationDate: DateTime, deletedDate: DateTime?, revisionDate: DateTime, archivedDate: DateTime?,
14101419
/**
14111420
* Hints for the presentation layer for which fields can be copied.
14121421
*/copyableFields: [CopyableCipherFields], localData: LocalDataView?) {
@@ -1429,6 +1438,7 @@ public struct CipherListView {
14291438
self.creationDate = creationDate
14301439
self.deletedDate = deletedDate
14311440
self.revisionDate = revisionDate
1441+
self.archivedDate = archivedDate
14321442
self.copyableFields = copyableFields
14331443
self.localData = localData
14341444
}
@@ -1498,6 +1508,9 @@ extension CipherListView: Equatable, Hashable {
14981508
if lhs.revisionDate != rhs.revisionDate {
14991509
return false
15001510
}
1511+
if lhs.archivedDate != rhs.archivedDate {
1512+
return false
1513+
}
15011514
if lhs.copyableFields != rhs.copyableFields {
15021515
return false
15031516
}
@@ -1527,6 +1540,7 @@ extension CipherListView: Equatable, Hashable {
15271540
hasher.combine(creationDate)
15281541
hasher.combine(deletedDate)
15291542
hasher.combine(revisionDate)
1543+
hasher.combine(archivedDate)
15301544
hasher.combine(copyableFields)
15311545
hasher.combine(localData)
15321546
}
@@ -1560,6 +1574,7 @@ public struct FfiConverterTypeCipherListView: FfiConverterRustBuffer {
15601574
creationDate: FfiConverterTypeDateTime.read(from: &buf),
15611575
deletedDate: FfiConverterOptionTypeDateTime.read(from: &buf),
15621576
revisionDate: FfiConverterTypeDateTime.read(from: &buf),
1577+
archivedDate: FfiConverterOptionTypeDateTime.read(from: &buf),
15631578
copyableFields: FfiConverterSequenceTypeCopyableCipherFields.read(from: &buf),
15641579
localData: FfiConverterOptionTypeLocalDataView.read(from: &buf)
15651580
)
@@ -1585,6 +1600,7 @@ public struct FfiConverterTypeCipherListView: FfiConverterRustBuffer {
15851600
FfiConverterTypeDateTime.write(value.creationDate, into: &buf)
15861601
FfiConverterOptionTypeDateTime.write(value.deletedDate, into: &buf)
15871602
FfiConverterTypeDateTime.write(value.revisionDate, into: &buf)
1603+
FfiConverterOptionTypeDateTime.write(value.archivedDate, into: &buf)
15881604
FfiConverterSequenceTypeCopyableCipherFields.write(value.copyableFields, into: &buf)
15891605
FfiConverterOptionTypeLocalDataView.write(value.localData, into: &buf)
15901606
}
@@ -1706,13 +1722,14 @@ public struct CipherView {
17061722
public let creationDate: DateTime
17071723
public let deletedDate: DateTime?
17081724
public let revisionDate: DateTime
1725+
public let archivedDate: DateTime?
17091726

17101727
// Default memberwise initializers are never public by default, so we
17111728
// declare one manually.
17121729
public init(id: CipherId?, organizationId: OrganizationId?, folderId: FolderId?, collectionIds: [CollectionId],
17131730
/**
17141731
* Temporary, required to support re-encrypting existing items.
1715-
*/key: EncString?, name: String, notes: String?, type: CipherType, login: LoginView?, identity: IdentityView?, card: CardView?, secureNote: SecureNoteView?, sshKey: SshKeyView?, favorite: Bool, reprompt: CipherRepromptType, organizationUseTotp: Bool, edit: Bool, permissions: CipherPermissions?, viewPassword: Bool, localData: LocalDataView?, attachments: [AttachmentView]?, fields: [FieldView]?, passwordHistory: [PasswordHistoryView]?, creationDate: DateTime, deletedDate: DateTime?, revisionDate: DateTime) {
1732+
*/key: EncString?, name: String, notes: String?, type: CipherType, login: LoginView?, identity: IdentityView?, card: CardView?, secureNote: SecureNoteView?, sshKey: SshKeyView?, favorite: Bool, reprompt: CipherRepromptType, organizationUseTotp: Bool, edit: Bool, permissions: CipherPermissions?, viewPassword: Bool, localData: LocalDataView?, attachments: [AttachmentView]?, fields: [FieldView]?, passwordHistory: [PasswordHistoryView]?, creationDate: DateTime, deletedDate: DateTime?, revisionDate: DateTime, archivedDate: DateTime?) {
17161733
self.id = id
17171734
self.organizationId = organizationId
17181735
self.folderId = folderId
@@ -1739,6 +1756,7 @@ public struct CipherView {
17391756
self.creationDate = creationDate
17401757
self.deletedDate = deletedDate
17411758
self.revisionDate = revisionDate
1759+
self.archivedDate = archivedDate
17421760
}
17431761
}
17441762

@@ -1827,6 +1845,9 @@ extension CipherView: Equatable, Hashable {
18271845
if lhs.revisionDate != rhs.revisionDate {
18281846
return false
18291847
}
1848+
if lhs.archivedDate != rhs.archivedDate {
1849+
return false
1850+
}
18301851
return true
18311852
}
18321853

@@ -1857,6 +1878,7 @@ extension CipherView: Equatable, Hashable {
18571878
hasher.combine(creationDate)
18581879
hasher.combine(deletedDate)
18591880
hasher.combine(revisionDate)
1881+
hasher.combine(archivedDate)
18601882
}
18611883
}
18621884

@@ -1894,7 +1916,8 @@ public struct FfiConverterTypeCipherView: FfiConverterRustBuffer {
18941916
passwordHistory: FfiConverterOptionSequenceTypePasswordHistoryView.read(from: &buf),
18951917
creationDate: FfiConverterTypeDateTime.read(from: &buf),
18961918
deletedDate: FfiConverterOptionTypeDateTime.read(from: &buf),
1897-
revisionDate: FfiConverterTypeDateTime.read(from: &buf)
1919+
revisionDate: FfiConverterTypeDateTime.read(from: &buf),
1920+
archivedDate: FfiConverterOptionTypeDateTime.read(from: &buf)
18981921
)
18991922
}
19001923

@@ -1925,6 +1948,7 @@ public struct FfiConverterTypeCipherView: FfiConverterRustBuffer {
19251948
FfiConverterTypeDateTime.write(value.creationDate, into: &buf)
19261949
FfiConverterOptionTypeDateTime.write(value.deletedDate, into: &buf)
19271950
FfiConverterTypeDateTime.write(value.revisionDate, into: &buf)
1951+
FfiConverterOptionTypeDateTime.write(value.archivedDate, into: &buf)
19281952
}
19291953
}
19301954

0 commit comments

Comments
 (0)