[PM-26347] Bump version to 1.85 / version 2024

Cargo.toml

@@ -8,9 +8,9 @@ exclude = ["support/lints"]
 # Update using `cargo set-version -p bitwarden-core <new-version>`
 version = "1.0.0"
 authors = ["Bitwarden Inc"]
-edition = "2021"
+edition = "2024"
 # Important: Changing rust-version should be considered a breaking change
-rust-version = "1.82"
+rust-version = "1.85"
 homepage = "https://bitwarden.com"
 repository = "https://github.com/bitwarden/sdk-internal"
 license-file = "LICENSE"

bitwarden_license/bitwarden-sm/src/client_projects.rs

@@ -3,9 +3,9 @@ use bitwarden_core::Client;
 use crate::{
     error::SecretsManagerError,
     projects::{
-        create_project, delete_projects, get_project, list_projects, update_project,
         ProjectCreateRequest, ProjectGetRequest, ProjectPutRequest, ProjectResponse,
         ProjectsDeleteRequest, ProjectsDeleteResponse, ProjectsListRequest, ProjectsResponse,
+        create_project, delete_projects, get_project, list_projects, update_project,
     },
 };
 

bitwarden_license/bitwarden-sm/src/client_secrets.rs

@@ -3,12 +3,11 @@ use bitwarden_core::Client;
 use crate::{
     error::SecretsManagerError,
     secrets::{
-        create_secret, delete_secrets, get_secret, get_secrets_by_ids, list_secrets,
-        list_secrets_by_project, sync_secrets, update_secret, SecretCreateRequest,
-        SecretGetRequest, SecretIdentifiersByProjectRequest, SecretIdentifiersRequest,
-        SecretIdentifiersResponse, SecretPutRequest, SecretResponse, SecretsDeleteRequest,
-        SecretsDeleteResponse, SecretsGetRequest, SecretsResponse, SecretsSyncRequest,
-        SecretsSyncResponse,
+        SecretCreateRequest, SecretGetRequest, SecretIdentifiersByProjectRequest,
+        SecretIdentifiersRequest, SecretIdentifiersResponse, SecretPutRequest, SecretResponse,
+        SecretsDeleteRequest, SecretsDeleteResponse, SecretsGetRequest, SecretsResponse,
+        SecretsSyncRequest, SecretsSyncResponse, create_secret, delete_secrets, get_secret,
+        get_secrets_by_ids, list_secrets, list_secrets_by_project, sync_secrets, update_secret,
     },
 };
 
@@ -118,12 +117,12 @@ impl SecretsClientExt for Client {
 #[cfg(test)]
 mod tests {
     use bitwarden_core::{
-        auth::login::AccessTokenLoginRequest, Client, ClientSettings, DeviceType,
+        Client, ClientSettings, DeviceType, auth::login::AccessTokenLoginRequest,
     };
 
     use crate::{
-        secrets::{SecretGetRequest, SecretIdentifiersRequest},
         ClientSecretsExt,
+        secrets::{SecretGetRequest, SecretIdentifiersRequest},
     };
 
     async fn start_mock(mocks: Vec<wiremock::Mock>) -> (wiremock::MockServer, Client) {
@@ -145,7 +144,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_access_token_login() {
-        use wiremock::{matchers, Mock, ResponseTemplate};
+        use wiremock::{Mock, ResponseTemplate, matchers};
 
         // Create the mock server with the necessary routes for this test
         let (_server, client) = start_mock(vec![

bitwarden_license/bitwarden-sm/src/projects/create.rs

@@ -1,13 +1,13 @@
 use bitwarden_api_api::models::ProjectCreateRequestModel;
-use bitwarden_core::{key_management::SymmetricKeyId, Client, OrganizationId};
+use bitwarden_core::{Client, OrganizationId, key_management::SymmetricKeyId};
 use bitwarden_crypto::PrimitiveEncryptable;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 use validator::Validate;
 
 use crate::{
-    error::{validate_only_whitespaces, SecretsManagerError},
+    error::{SecretsManagerError, validate_only_whitespaces},
     projects::ProjectResponse,
 };
 

bitwarden_license/bitwarden-sm/src/projects/mod.rs

@@ -5,14 +5,14 @@ mod list;
 mod project_response;
 mod update;
 
-pub(crate) use create::create_project;
 pub use create::ProjectCreateRequest;
+pub(crate) use create::create_project;
 pub(crate) use delete::delete_projects;
 pub use delete::{ProjectsDeleteRequest, ProjectsDeleteResponse};
-pub(crate) use get::get_project;
 pub use get::ProjectGetRequest;
+pub(crate) use get::get_project;
 pub(crate) use list::list_projects;
 pub use list::{ProjectsListRequest, ProjectsResponse};
 pub use project_response::ProjectResponse;
-pub(crate) use update::update_project;
 pub use update::ProjectPutRequest;
+pub(crate) use update::update_project;

bitwarden_license/bitwarden-sm/src/projects/project_response.rs

@@ -1,7 +1,8 @@
 use bitwarden_api_api::models::ProjectResponseModel;
 use bitwarden_core::{
+    OrganizationId,
     key_management::{KeyIds, SymmetricKeyId},
-    require, OrganizationId,
+    require,
 };
 use bitwarden_crypto::{Decryptable, EncString, KeyStoreContext};
 use chrono::{DateTime, Utc};

bitwarden_license/bitwarden-sm/src/projects/update.rs

@@ -1,13 +1,13 @@
 use bitwarden_api_api::models::ProjectUpdateRequestModel;
-use bitwarden_core::{key_management::SymmetricKeyId, Client, OrganizationId};
+use bitwarden_core::{Client, OrganizationId, key_management::SymmetricKeyId};
 use bitwarden_crypto::PrimitiveEncryptable;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 use validator::Validate;
 
 use crate::{
-    error::{validate_only_whitespaces, SecretsManagerError},
+    error::{SecretsManagerError, validate_only_whitespaces},
     projects::ProjectResponse,
 };
 

bitwarden_license/bitwarden-sm/src/secrets/create.rs

@@ -1,13 +1,13 @@
 use bitwarden_api_api::models::SecretCreateRequestModel;
-use bitwarden_core::{key_management::SymmetricKeyId, Client, OrganizationId};
+use bitwarden_core::{Client, OrganizationId, key_management::SymmetricKeyId};
 use bitwarden_crypto::PrimitiveEncryptable;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 use validator::Validate;
 
 use crate::{
-    error::{validate_only_whitespaces, SecretsManagerError},
+    error::{SecretsManagerError, validate_only_whitespaces},
     secrets::SecretResponse,
 };
 

bitwarden_license/bitwarden-sm/src/secrets/list.rs

@@ -2,9 +2,10 @@ use bitwarden_api_api::models::{
     SecretWithProjectsListResponseModel, SecretsWithProjectsInnerSecret,
 };
 use bitwarden_core::{
+    OrganizationId,
     client::Client,
     key_management::{KeyIds, SymmetricKeyId},
-    require, OrganizationId,
+    require,
 };
 use bitwarden_crypto::{Decryptable, EncString, KeyStoreContext};
 use schemars::JsonSchema;

bitwarden_license/bitwarden-sm/src/secrets/mod.rs

@@ -7,20 +7,20 @@ mod secret_response;
 mod sync;
 mod update;
 
-pub(crate) use create::create_secret;
 pub use create::SecretCreateRequest;
+pub(crate) use create::create_secret;
 pub(crate) use delete::delete_secrets;
 pub use delete::{SecretsDeleteRequest, SecretsDeleteResponse};
-pub(crate) use get::get_secret;
 pub use get::SecretGetRequest;
-pub(crate) use get_by_ids::get_secrets_by_ids;
+pub(crate) use get::get_secret;
 pub use get_by_ids::SecretsGetRequest;
-pub(crate) use list::{list_secrets, list_secrets_by_project};
+pub(crate) use get_by_ids::get_secrets_by_ids;
 pub use list::{
     SecretIdentifiersByProjectRequest, SecretIdentifiersRequest, SecretIdentifiersResponse,
 };
+pub(crate) use list::{list_secrets, list_secrets_by_project};
 pub use secret_response::{SecretResponse, SecretsResponse};
 pub(crate) use sync::sync_secrets;
 pub use sync::{SecretsSyncRequest, SecretsSyncResponse};
-pub(crate) use update::update_secret;
 pub use update::SecretPutRequest;
+pub(crate) use update::update_secret;

bitwarden_license/bitwarden-sm/src/secrets/secret_response.rs

@@ -2,8 +2,9 @@ use bitwarden_api_api::models::{
     BaseSecretResponseModel, BaseSecretResponseModelListResponseModel, SecretResponseModel,
 };
 use bitwarden_core::{
+    OrganizationId,
     key_management::{KeyIds, SymmetricKeyId},
-    require, OrganizationId,
+    require,
 };
 use bitwarden_crypto::{Decryptable, EncString, KeyStoreContext};
 use chrono::{DateTime, Utc};

bitwarden_license/bitwarden-sm/src/secrets/sync.rs

@@ -1,5 +1,5 @@
 use bitwarden_api_api::models::SecretsSyncResponseModel;
-use bitwarden_core::{key_management::KeyIds, require, Client};
+use bitwarden_core::{Client, key_management::KeyIds, require};
 use bitwarden_crypto::KeyStoreContext;
 use chrono::{DateTime, Utc};
 use schemars::JsonSchema;

bitwarden_license/bitwarden-sm/src/secrets/update.rs

@@ -1,13 +1,13 @@
 use bitwarden_api_api::models::SecretUpdateRequestModel;
-use bitwarden_core::{key_management::SymmetricKeyId, Client, OrganizationId};
+use bitwarden_core::{Client, OrganizationId, key_management::SymmetricKeyId};
 use bitwarden_crypto::PrimitiveEncryptable;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 use validator::Validate;
 
 use crate::{
-    error::{validate_only_whitespaces, SecretsManagerError},
+    error::{SecretsManagerError, validate_only_whitespaces},
     secrets::SecretResponse,
 };