diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a073dba09..67862dd1d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ env:
RUST_CACHE_DIRS: "~/.cargo/registry\n~/.cargo/git\ntarget\n"
LIBCLANG_PATH_WIN: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/Llvm/x64/bin"
CODE_SIGNER_PATH_WIN: "%win10sdk%/x64/signtool.exe"
- CARGO_MAKE_VERSION: 0.35.10
+ CARGO_MAKE_VERSION: 0.35.13
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0"
APP_NAME: swift-console
diff --git a/Makefile.toml b/Makefile.toml
index b3db51e55..3cd0308fd 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -91,18 +91,13 @@ set_env PYTHON_FILES ${py_files}
command = "rustup"
args = ["update", "stable"]
-[tasks.taplo-cli-update]
-install_crate = { crate_name = "taplo-cli", binary = "taplo", test_arg = [
- "--help",
-], version = "0.6.0" }
-
[tasks.cargo-make-deps-update]
-dependencies = ["rustup-update", "taplo-cli-update"]
+dependencies = ["rustup-update"]
install_crate = { crate_name = "cargo-update", binary = "cargo-install-update", test_arg = [
"-V",
], min_version = "7.0.1" }
command = "cargo"
-args = ["install-update", "cargo-make"]
+args = ["install-update", "taplo-cli", "cargo-make"]
[tasks.generate-common-constants-rs]
script_runner = "@duckscript"
@@ -964,16 +959,6 @@ dependencies = ["set-python-files"]
command = "${PYTHON}"
args = ["-m", "pylint", "--output-format=parseable", "@@split(PYTHON_FILES, )"]
-[tasks.format-toml]
-description = "Formats all toml files defined in the CARGO_MAKE_FORMAT_TOML_FILES environment variable."
-category = "Development"
-condition = { env_set = ["CARGO_MAKE_FORMAT_TOML_FILES"] }
-install_crate = { crate_name = "taplo-cli", binary = "taplo", version = "0.6.0", test_arg = [
- "--help",
-] }
-command = "taplo"
-args = ["format", "${CARGO_MAKE_FORMAT_TOML_FILES}"]
-
[tasks.toml-format-check]
# Note format-toml task is defined by cargo-make to use crate taplo-cli, but the version is
# unspecified. Task cargo-make-deps-update keeps the dev version in sync with CI.
diff --git a/installers/macOS/Info.plist b/installers/macOS/Info.plist
index 67ff63106..ba28d3334 100644
--- a/installers/macOS/Info.plist
+++ b/installers/macOS/Info.plist
@@ -32,4 +32,4 @@
CFBundleVersion
@@VERSION@@
-
\ No newline at end of file
+