diff --git a/Cargo.toml b/Cargo.toml index ebed68081..3a17134db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -149,24 +149,24 @@ optional = true default-features = false [dependencies.bson2] +version = "2.15.0" git = "https://github.com/mongodb/bson-rust" branch = "2.15.x" package = "bson" -version = "2.15.0" optional = true [dependencies.bson3] +version = "3.0.0" git = "https://github.com/mongodb/bson-rust" branch = "main" package = "bson" -version = "3.0.0" optional = true features = ["serde"] [dependencies.mongocrypt] +version = "0.3.1" git = "https://github.com/mongodb/libmongocrypt-rust.git" branch = "main" -version = "0.3.1" default-features = false optional = true diff --git a/etc/update_version/src/main.rs b/etc/update_version/src/main.rs index f1383bb04..cda756a3b 100644 --- a/etc/update_version/src/main.rs +++ b/etc/update_version/src/main.rs @@ -64,9 +64,13 @@ struct Args { #[argh(option)] version: String, - /// version of the bson crate + /// version of the bson crate (2.x) #[argh(option)] - bson: Option, + bson2: Option, + + /// version of the bson crate (3.x) + #[argh(option)] + bson3: Option, /// version of the mongocrypt crate #[argh(option)] @@ -110,16 +114,26 @@ fn main() { pending.apply(loc, &args.version); } - if let Some(bson) = args.bson { - let bson_version_loc = - Location::new("Cargo.toml", r#"bson =.*version = "(?.*?)".*"#); - pending.apply(&bson_version_loc, &bson); + if let Some(bson2) = args.bson2 { + let bson_version_loc = Location::new( + "Cargo.toml", + r#"\[dependencies.bson2\]\nversion = "(?.*?)"\n"#, + ); + pending.apply(&bson_version_loc, &bson2); + } + + if let Some(bson3) = args.bson3 { + let bson_version_loc = Location::new( + "Cargo.toml", + r#"\[dependencies.bson3\]\nversion = "(?.*?)"\n"#, + ); + pending.apply(&bson_version_loc, &bson3); } if let Some(mongocrypt) = args.mongocrypt { let mongocrypt_version_loc = Location::new( "Cargo.toml", - r#"mongocrypt =.*version = "(?.*?)".*"#, + r#"\[dependencies.mongocrypt\]\nversion = "(?.*?)".*"#, ); pending.apply(&mongocrypt_version_loc, &mongocrypt); } diff --git a/src/lib.rs b/src/lib.rs index d41b2da1c..77c5f65cc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -21,7 +21,7 @@ pub mod options; pub use ::mongocrypt; pub mod action; -pub mod atlas_search; +//pub mod atlas_search; pub(crate) mod bson_compat; mod bson_util; pub mod change_stream;