bitwarden/sdk-internal@0364659 1.0.0-2829-0364659 - [PM-26534] Remove non-generic wrapper for PasswordProtectedKeyEnvelope (bitwarden/sdk-internal#488)

Author: bitwarden-devops-bot

Package.swift

@@ -30,7 +30,7 @@ let package = Package(
             dependencies: ["BitwardenSdk"]),
         .binaryTarget(
   name: "BitwardenFFI",
-  url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-2812-ac71502/BitwardenFFI-1.0.0-ac71502.xcframework.zip",
-  checksum: "104b4cda92779367398d38341f4bf00f1882e925dc67b76167b173b284defff2")
+  url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-2829-0364659/BitwardenFFI-1.0.0-0364659.xcframework.zip",
+  checksum: "a022b9b67b0184d71f4c51a903a032a865be3fdd8a143e8bece294638facc20a")
     ]
 )

Sources/BitwardenSdk/BitwardenCollections.swift

@@ -998,8 +998,8 @@ private let initializationResult: InitializationResult = {
         return InitializationResult.contractVersionMismatch
     }
 
-    uniffiEnsureBitwardenCoreInitialized()
     uniffiEnsureBitwardenCryptoInitialized()
+    uniffiEnsureBitwardenCoreInitialized()
     return InitializationResult.ok
 }()
 

Sources/BitwardenSdk/BitwardenCore.swift

@@ -4869,50 +4869,6 @@ public func FfiConverterTypeOrganizationId_lower(_ value: OrganizationId) -> Rus
 
 
 
-/**
- * Typealias from the type name used in the UDL file to the builtin type.  This
- * is needed because the UDL type name is used in function/method signatures.
- */
-public typealias PasswordProtectedKeyEnvelope = String
-
-#if swift(>=5.8)
-@_documentation(visibility: private)
-#endif
-public struct FfiConverterTypePasswordProtectedKeyEnvelope: FfiConverter {
-    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> PasswordProtectedKeyEnvelope {
-        return try FfiConverterString.read(from: &buf)
-    }
-
-    public static func write(_ value: PasswordProtectedKeyEnvelope, into buf: inout [UInt8]) {
-        return FfiConverterString.write(value, into: &buf)
-    }
-
-    public static func lift(_ value: RustBuffer) throws -> PasswordProtectedKeyEnvelope {
-        return try FfiConverterString.lift(value)
-    }
-
-    public static func lower(_ value: PasswordProtectedKeyEnvelope) -> RustBuffer {
-        return FfiConverterString.lower(value)
-    }
-}
-
-
-#if swift(>=5.8)
-@_documentation(visibility: private)
-#endif
-public func FfiConverterTypePasswordProtectedKeyEnvelope_lift(_ value: RustBuffer) throws -> PasswordProtectedKeyEnvelope {
-    return try FfiConverterTypePasswordProtectedKeyEnvelope.lift(value)
-}
-
-#if swift(>=5.8)
-@_documentation(visibility: private)
-#endif
-public func FfiConverterTypePasswordProtectedKeyEnvelope_lower(_ value: PasswordProtectedKeyEnvelope) -> RustBuffer {
-    return FfiConverterTypePasswordProtectedKeyEnvelope.lower(value)
-}
-
-
-
 /**
  * Typealias from the type name used in the UDL file to the builtin type.  This
  * is needed because the UDL type name is used in function/method signatures.

Sources/BitwardenSdk/BitwardenCrypto.swift

@@ -1249,6 +1249,50 @@ public func FfiConverterTypeNonZeroU32_lower(_ value: NonZeroU32) -> UInt32 {
 
 
 
+/**
+ * Typealias from the type name used in the UDL file to the builtin type.  This
+ * is needed because the UDL type name is used in function/method signatures.
+ */
+public typealias PasswordProtectedKeyEnvelope = String
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public struct FfiConverterTypePasswordProtectedKeyEnvelope: FfiConverter {
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> PasswordProtectedKeyEnvelope {
+        return try FfiConverterString.read(from: &buf)
+    }
+
+    public static func write(_ value: PasswordProtectedKeyEnvelope, into buf: inout [UInt8]) {
+        return FfiConverterString.write(value, into: &buf)
+    }
+
+    public static func lift(_ value: RustBuffer) throws -> PasswordProtectedKeyEnvelope {
+        return try FfiConverterString.lift(value)
+    }
+
+    public static func lower(_ value: PasswordProtectedKeyEnvelope) -> RustBuffer {
+        return FfiConverterString.lower(value)
+    }
+}
+
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public func FfiConverterTypePasswordProtectedKeyEnvelope_lift(_ value: RustBuffer) throws -> PasswordProtectedKeyEnvelope {
+    return try FfiConverterTypePasswordProtectedKeyEnvelope.lift(value)
+}
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public func FfiConverterTypePasswordProtectedKeyEnvelope_lower(_ value: PasswordProtectedKeyEnvelope) -> RustBuffer {
+    return FfiConverterTypePasswordProtectedKeyEnvelope.lower(value)
+}
+
+
+
 /**
  * Typealias from the type name used in the UDL file to the builtin type.  This
  * is needed because the UDL type name is used in function/method signatures.

Sources/BitwardenSdk/BitwardenFido.swift

@@ -3384,8 +3384,8 @@ private let initializationResult: InitializationResult = {
         return InitializationResult.contractVersionMismatch
     }
 
-    uniffiEnsureBitwardenCoreInitialized()
     uniffiEnsureBitwardenVaultInitialized()
+    uniffiEnsureBitwardenCoreInitialized()
     return InitializationResult.ok
 }()
 

Sources/BitwardenSdk/BitwardenSDK.swift

@@ -8177,16 +8177,16 @@ private let initializationResult: InitializationResult = {
     uniffiCallbackInitFido2UserInterface()
     uniffiCallbackInitFolderRepository()
     uniffiEnsureBitwardenCryptoInitialized()
-    uniffiEnsureBitwardenGeneratorsInitialized()
-    uniffiEnsureBitwardenCoreInitialized()
-    uniffiEnsureBitwardenEncodingInitialized()
-    uniffiEnsureBitwardenExportersInitialized()
     uniffiEnsureBitwardenSendInitialized()
     uniffiEnsureBitwardenCollectionsInitialized()
+    uniffiEnsureBitwardenExportersInitialized()
+    uniffiEnsureBitwardenGeneratorsInitialized()
+    uniffiEnsureBitwardenStateInitialized()
+    uniffiEnsureBitwardenFidoInitialized()
+    uniffiEnsureBitwardenEncodingInitialized()
     uniffiEnsureBitwardenVaultInitialized()
     uniffiEnsureBitwardenSshInitialized()
-    uniffiEnsureBitwardenFidoInitialized()
-    uniffiEnsureBitwardenStateInitialized()
+    uniffiEnsureBitwardenCoreInitialized()
     return InitializationResult.ok
 }()
 

Sources/BitwardenSdk/BitwardenSend.swift

@@ -2031,8 +2031,8 @@ private let initializationResult: InitializationResult = {
         return InitializationResult.contractVersionMismatch
     }
 
-    uniffiEnsureBitwardenCoreInitialized()
     uniffiEnsureBitwardenCryptoInitialized()
+    uniffiEnsureBitwardenCoreInitialized()
     return InitializationResult.ok
 }()
 

Sources/BitwardenSdk/BitwardenVault.swift

@@ -8401,9 +8401,9 @@ private let initializationResult: InitializationResult = {
         return InitializationResult.contractVersionMismatch
     }
 
+    uniffiEnsureBitwardenCryptoInitialized()
     uniffiEnsureBitwardenCollectionsInitialized()
     uniffiEnsureBitwardenCoreInitialized()
-    uniffiEnsureBitwardenCryptoInitialized()
     return InitializationResult.ok
 }()