chore(cargo): update derive_more from 1.0.0-beta.6 to 1.0.0-beta.7

Revert "chore(cargo): update rusqlite"
This reverts commit 1b92d18777.
2026-07-12 05:53:27 +03:00 · 2024-08-03 21:21:56 +00:00 · 2024-08-03 19:19:55 +00:00 · 2024-08-03 19:08:47 +00:00 · 2024-08-03 19:08:29 +00:00 · 2024-08-02 23:06:30 +00:00
5 changed files with 30 additions and 34 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1417,7 +1417,6 @@ dependencies = [
 "async-native-tls",
 "async-smtp",
 "async_zip",
- "backtrace",
 "base64 0.22.1",
 "brotli",
 "chrono",
@@ -1469,7 +1468,6 @@ dependencies = [
 "serde",
 "serde_json",
 "sha-1",
- "sha2 0.10.8",
 "smallvec",
 "strum",
 "strum_macros",
@@ -1717,18 +1715,18 @@ dependencies = [

 [[package]]
 name = "derive_more"
-version = "1.0.0-beta.6"
+version = "1.0.0-beta.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7abbfc297053be59290e3152f8cbcd52c8642e0728b69ee187d991d4c1af08d"
+checksum = "3249c0372e72f5f93b5c0ca54c0ab76bbf6216b6f718925476fd9bc4ffabb4fe"
 dependencies = [
 "derive_more-impl",
 ]

 [[package]]
 name = "derive_more-impl"
-version = "1.0.0-beta.6"
+version = "1.0.0-beta.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e"
+checksum = "27d919ced7590fc17b5d5a3c63b662e8a7d2324212c4e4dbbed975cafd22d16d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2232,9 +2230,9 @@ dependencies = [

 [[package]]
 name = "env_logger"
-version = "0.11.3"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
 dependencies = [
 "anstream",
 "anstyle",
@@ -3400,7 +3398,7 @@ dependencies = [
 "anyhow",
 "crypto_box",
 "data-encoding",
- "derive_more 1.0.0-beta.6",
+ "derive_more 1.0.0-beta.7",
 "ed25519-dalek 2.1.1",
 "getrandom 0.2.12",
 "hex",
@@ -3439,7 +3437,7 @@ checksum = "60a25bef4066809009d90cb5ff885c0d1adf77690805431f45577e624af0b4c6"
 dependencies = [
 "anyhow",
 "bytes",
- "derive_more 1.0.0-beta.6",
+ "derive_more 1.0.0-beta.7",
 "ed25519-dalek 2.1.1",
 "futures-lite 2.3.0",
 "genawaiter",
@@ -3491,7 +3489,7 @@ dependencies = [
 "bytes",
 "clap",
 "der 0.7.8",
- "derive_more 1.0.0-beta.6",
+ "derive_more 1.0.0-beta.7",
 "duct",
 "flume",
 "futures-buffered",
@@ -3885,13 +3883,14 @@ dependencies = [

 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
 dependencies = [
+ "hermit-abi",
 "libc",
 "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -5058,9 +5057,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"

 [[package]]
 name = "quick-xml"
-version = "0.35.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86e446ed58cef1bbfe847bc2fda0e2e4ea9f0e57b90c507d4781292590d72a4e"
+checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
 dependencies = [
 "memchr",
 ]
@@ -6750,21 +6749,20 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.38.0"
+version = "1.39.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
 dependencies = [
 "backtrace",
 "bytes",
 "libc",
 "mio",
- "num_cpus",
 "parking_lot",
 "pin-project-lite",
 "signal-hook-registry",
 "socket2",
 "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -6779,9 +6777,9 @@ dependencies = [

 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -7278,9 +7276,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"

 [[package]]
 name = "uuid"
-version = "1.9.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
 "getrandom 0.2.12",
 "serde",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,6 @@ async-imap = { version = "0.9.7", default-features = false, features = ["runtime
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
 async_zip = { version = "0.0.12", default-features = false, features = ["deflate", "fs"] }
-backtrace = "0.3"
 base64 = { workspace = true }
 brotli = { version = "6", default-features=false, features = ["std"] }
 chrono = { workspace = true, features = ["alloc", "clock", "std"] }
@@ -77,7 +76,7 @@ percent-encoding = "2.3"
 parking_lot = "0.12"
 pgp = { version = "0.13", default-features = false }
 qrcodegen = "1.7.0"
-quick-xml = "0.35"
+quick-xml = "0.36"
 quoted_printable = "0.5"
 rand = { workspace = true }
 regex = { workspace = true }
@@ -88,7 +87,6 @@ sanitize-filename = { workspace = true }
 serde_json = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 sha-1 = "0.10"
-sha2 = "0.10"
 smallvec = "1.13.2"
 strum = "0.26"
 strum_macros = "0.26"
@@ -164,8 +162,8 @@ async-channel = "2.3.1"
 base64 = "0.22"
 chrono = { version = "0.4.38", default-features = false }
 deltachat-contact-tools = { path = "deltachat-contact-tools" }
-deltachat-jsonrpc = { path = "deltachat-jsonrpc" }
-deltachat = { path = "." }
+deltachat-jsonrpc = { path = "deltachat-jsonrpc", default-features = false }
+deltachat = { path = ".", default-features = false }
 futures = "0.3.30"
 futures-lite = "2.3.0"
 libc = "0.2"
@@ -180,7 +178,7 @@ serde_json = "1"
 serde = "1.0"
 tempfile = "3.10.1"
 thiserror = "1"
-tokio = "1.38.0"
+tokio = "1.39.2"
 tokio-util = "0.7.11"
 tracing-subscriber = "0.3"
 yerpc = "0.6.2"
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -29,6 +29,6 @@ yerpc = { workspace = true, features = ["anyhow_expose"] }

 [features]
 default = ["vendored"]
-vendored = ["deltachat/vendored"]
+vendored = ["deltachat/vendored", "deltachat-jsonrpc/vendored"]
 jsonrpc = ["dep:deltachat-jsonrpc"]

--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -33,7 +33,7 @@ base64 = { workspace = true }

 # optional dependencies
 axum = { version = "0.7", optional = true, features = ["ws"] }
-env_logger = { version = "0.11.3", optional = true }
+env_logger = { version = "0.11.5", optional = true }

 [dev-dependencies]
 tokio = { workspace = true, features = ["full", "rt-multi-thread"] }
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -10,8 +10,8 @@ keywords = ["deltachat", "chat", "openpgp", "email", "encryption"]
 categories = ["cryptography", "std", "email"]

 [dependencies]
-deltachat-jsonrpc = { workspace = true, default-features = false }
-deltachat = { workspace = true, default-features = false }
+deltachat-jsonrpc = { workspace = true }
+deltachat = { workspace = true }

 anyhow = { workspace = true }
 futures-lite = { workspace = true }
Author	SHA1	Message	Date
link2xt	7136a6311c	chore(cargo): update derive_more from 1.0.0-beta.6 to 1.0.0-beta.7	2024-08-03 21:21:56 +00:00
link2xt	39ed587959	Revert "chore(cargo): update rusqlite" This reverts commit `1b92d18777`.	2024-08-03 19:19:55 +00:00
link2xt	c4327a0558	Fix cargo warnings about default-features Otherwise cargo emits these warnings: warning: .../deltachat-core-rust/deltachat-ffi/Cargo.toml: `default-features` is ignored for deltachat, since `default-features` was not specified for `workspace.dependencies.deltachat`, this could become a hard error in the future warning: .../deltachat-core-rust/deltachat-rpc-server/Cargo.toml: `default-features` is ignored for deltachat, since `default-features` was not specified for `workspace.dependencies.deltachat`, this could become a hard error in the future warning: .../deltachat-core-rust/deltachat-rpc-server/Cargo.toml: `default-features` is ignored for deltachat-jsonrpc, since `default-features` was not specified for `workspace.dependencies.deltachat-jsonrpc`, this could become a hard error in the future	2024-08-03 19:08:47 +00:00
link2xt	1b92d18777	chore(cargo): update rusqlite	2024-08-03 19:08:29 +00:00
link2xt	a67503ae4a	chore: remove `backtrace` dependency It is not used directly by `deltachat` crate.	2024-08-02 23:06:30 +00:00
link2xt	c54f39bea0	chore: remove sha2 dependency It is not used since `ce6ec64069`	2024-08-02 23:06:30 +00:00
dependabot[bot]	ff3138fa43	Merge pull request #5830 from deltachat/dependabot/cargo/env_logger-0.11.5	2024-08-02 21:39:16 +00:00
dependabot[bot]	09d46942ca	Merge pull request #5832 from deltachat/dependabot/cargo/tokio-1.39.2	2024-08-02 19:51:34 +00:00
dependabot[bot]	84e365d263	Merge pull request #5833 from deltachat/dependabot/cargo/uuid-1.10.0	2024-08-02 19:50:28 +00:00
dependabot[bot]	b31bcf5561	Merge pull request #5836 from deltachat/dependabot/cargo/quick-xml-0.36.1	2024-08-02 19:43:48 +00:00
dependabot[bot]	c9448feafc	chore(cargo): bump env_logger from 0.11.3 to 0.11.5 Bumps [env_logger](https://github.com/rust-cli/env_logger) from 0.11.3 to 0.11.5. - [Release notes](https://github.com/rust-cli/env_logger/releases) - [Changelog](https://github.com/rust-cli/env_logger/blob/main/CHANGELOG.md) - [Commits](https://github.com/rust-cli/env_logger/compare/v0.11.3...v0.11.5) --- updated-dependencies: - dependency-name: env_logger dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-02 15:51:02 +00:00
dependabot[bot]	7e7aa7aba0	chore(cargo): bump quick-xml from 0.35.0 to 0.36.1 Bumps [quick-xml](https://github.com/tafia/quick-xml) from 0.35.0 to 0.36.1. - [Release notes](https://github.com/tafia/quick-xml/releases) - [Changelog](https://github.com/tafia/quick-xml/blob/master/Changelog.md) - [Commits](https://github.com/tafia/quick-xml/compare/v0.35.0...v0.36.1) --- updated-dependencies: - dependency-name: quick-xml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-01 21:57:59 +00:00
dependabot[bot]	a69f9f01b3	chore(cargo): bump uuid from 1.9.1 to 1.10.0 Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.9.1 to 1.10.0. - [Release notes](https://github.com/uuid-rs/uuid/releases) - [Commits](https://github.com/uuid-rs/uuid/compare/1.9.1...1.10.0) --- updated-dependencies: - dependency-name: uuid dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-01 21:56:35 +00:00
dependabot[bot]	c808ed1368	chore(cargo): bump tokio from 1.38.0 to 1.39.2 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.38.0 to 1.39.2. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.38.0...tokio-1.39.2) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-01 21:56:05 +00:00