diff --git a/Cargo.lock b/Cargo.lock index 3f23cee21d0a8..c0e4c40a291f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -262,7 +262,7 @@ dependencies = [ [[package]] name = "aptos" -version = "4.2.5" +version = "4.2.6" dependencies = [ "anyhow", "aptos-api-types", diff --git a/crates/aptos/CHANGELOG.md b/crates/aptos/CHANGELOG.md index ce986951fac0c..882dd1dd4ac76 100644 --- a/crates/aptos/CHANGELOG.md +++ b/crates/aptos/CHANGELOG.md @@ -5,6 +5,9 @@ All notable changes to the Aptos CLI will be captured in this file. This project ## Unreleased - [`Fix`] Remove unwraps to make outputs go through regular error handling +## [4.2.6] - 2024/10/23 +- Fixing issue with `--move-2` flag which was still selecting language version 2.0 instead of 2.1. + ## [4.2.5] - 2024/10/23 - Bump to resolve issue with release version inconsistency. diff --git a/crates/aptos/Cargo.toml b/crates/aptos/Cargo.toml index f422fb5158421..3b65a2de669bf 100644 --- a/crates/aptos/Cargo.toml +++ b/crates/aptos/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aptos" description = "Aptos tool for management of nodes and interacting with the blockchain" -version = "4.2.5" +version = "4.2.6" # Workspace inherited keys authors = { workspace = true } diff --git a/crates/aptos/src/common/types.rs b/crates/aptos/src/common/types.rs index ddc6efdc9d629..dc8b22e8f758e 100644 --- a/crates/aptos/src/common/types.rs +++ b/crates/aptos/src/common/types.rs @@ -1176,7 +1176,7 @@ pub struct MovePackageDir { /// Currently, defaults to `1`, unless `--move-2` is selected. #[clap(long, value_parser = clap::value_parser!(LanguageVersion), alias = "language", - default_value_if("move_2", "true", "2.0"), + default_value_if("move_2", "true", "2.1"), verbatim_doc_comment)] pub language_version: Option, diff --git a/third_party/move/move-prover/move-docgen/tests/testsuite.rs b/third_party/move/move-prover/move-docgen/tests/testsuite.rs index a0ea0cfa648c2..0d24cac2e4429 100644 --- a/third_party/move/move-prover/move-docgen/tests/testsuite.rs +++ b/third_party/move/move-prover/move-docgen/tests/testsuite.rs @@ -91,7 +91,7 @@ fn test_docgen(path: &Path, mut options: Options, suffix: &str) -> anyhow::Resul if path.to_str().is_some_and(|s| s.contains(V2_TEST_DIR)) { options.compiler_v2 = true; - options.language_version = Some(LanguageVersion::V2_0); + options.language_version = Some(LanguageVersion::latest_stable()); } let mut error_writer = Buffer::no_color();