From c8d749d622405552c37fdedd6a80e8ee69f233b6 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Fri, 19 Apr 2024 17:36:14 +0200
Subject: [PATCH] chore(deps): bump tonic to 0.11 and raise MSRV to 1.70

BREAKING CHANGE:
This is a breaking change for users of `console-api` and
`console-subscriber`, as it changes the public `tonic` dependency to a
semver-incompatible version. This breaks compatibility with `tonic`
0.10.x.
---
 .github/workflows/ci.yml      |  4 ++--
 Cargo.lock                    | 12 ++++++------
 console-api/Cargo.toml        |  4 ++--
 console-subscriber/Cargo.toml |  4 ++--
 tokio-console/Cargo.toml      |  2 +-
 xtask/Cargo.toml              |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8c56fdc58..a97a93b53 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,8 +51,8 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
         rust: [stable]
         include:
-          # Make 1.64 MSRV, as it's Tonic 0.10's MSRV.
-          - rust: 1.64.0
+          # Make 1.70 MSRV, as it's Tonic 0.11's MSRV.
+          - rust: 1.70.0
             os: ubuntu-latest
           # Try to build on the latest nightly. This job is allowed to fail, but
           # it's useful to help catch bugs in upcoming Rust versions.
diff --git a/Cargo.lock b/Cargo.lock
index 0efb15ed8..c49c3e40a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1847,9 +1847,9 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5469afaf78a11265c343a88969045c1568aa8ecc6c787dbf756e92e70f199861"
+checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -1874,9 +1874,9 @@ dependencies = [
 
 [[package]]
 name = "tonic-build"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b477abbe1d18c0b08f56cd01d1bc288668c5b5cfd19b2ae1886bbf599c546f1"
+checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2"
 dependencies = [
  "prettyplease",
  "proc-macro2",
@@ -1887,9 +1887,9 @@ dependencies = [
 
 [[package]]
 name = "tonic-web"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fddb2a37b247e6adcb9f239f4e5cefdcc5ed526141a416b943929f13aea2cce"
+checksum = "dc3b0e1cedbf19fdfb78ef3d672cb9928e0a91a9cb4629cc0c916e8cff8aaaa1"
 dependencies = [
  "base64 0.21.0",
  "bytes",
diff --git a/console-api/Cargo.toml b/console-api/Cargo.toml
index 75d1c2f17..02a962c7a 100644
--- a/console-api/Cargo.toml
+++ b/console-api/Cargo.toml
@@ -29,7 +29,7 @@ keywords = [
 transport = ["tonic/transport"]
 
 [dependencies]
-tonic = { version = "0.10", default-features = false, features = [
+tonic = { version = "0.11", default-features = false, features = [
     "prost",
     "codegen",
     "transport",
@@ -40,7 +40,7 @@ tracing-core = "0.1.17"
 futures-core = "0.3"
 
 [dev-dependencies]
-tonic-build = { version = "0.10", default-features = false, features = [
+tonic-build = { version = "0.11", default-features = false, features = [
     "prost", "transport"
 ] }
 # explicit dep so we can get the version with fixed whitespace.
diff --git a/console-subscriber/Cargo.toml b/console-subscriber/Cargo.toml
index 6e7e48cd4..cf6f7745d 100644
--- a/console-subscriber/Cargo.toml
+++ b/console-subscriber/Cargo.toml
@@ -36,7 +36,7 @@ tokio = { version = "^1.21", features = ["sync", "time", "macros", "tracing"] }
 tokio-stream = { version = "0.1", features = ["net"] }
 thread_local = "1.1.3"
 console-api = { version = "0.6.0", path = "../console-api", features = ["transport"] }
-tonic = { version = "0.10", features = ["transport"] }
+tonic = { version = "0.11", features = ["transport"] }
 tracing-core = "0.1.24"
 tracing = "0.1.26"
 tracing-subscriber = { version = "0.3.17", default-features = false, features = ["fmt", "registry"] }
@@ -55,7 +55,7 @@ serde_json = "1"
 crossbeam-channel = "0.5"
 
 # Only for the web feature:
-tonic-web = { version = "0.10.2", optional = true }
+tonic-web = { version = "0.11", optional = true }
 
 [dev-dependencies]
 tokio = { version = "^1.21", features = ["full", "rt-multi-thread"] }
diff --git a/tokio-console/Cargo.toml b/tokio-console/Cargo.toml
index b9dfcd151..c032d9ced 100644
--- a/tokio-console/Cargo.toml
+++ b/tokio-console/Cargo.toml
@@ -38,7 +38,7 @@ console-api = { version = "0.6.0", path = "../console-api", features = ["transpo
 clap = { version = "~4.1.14", features = ["wrap_help", "cargo", "derive", "env"] }
 clap_complete = "~4.1.6"
 tokio = { version = "1", features = ["full", "rt-multi-thread"] }
-tonic = { version = "0.10", features = ["transport"] }
+tonic = { version = "0.11", features = ["transport"] }
 futures = "0.3"
 ratatui = { version = "0.20.1", default-features = false, features = ["crossterm"] }
 tower = "0.4.12"
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index adac3529e..96dd27a6a 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -7,7 +7,7 @@ rust-version = "1.64.0"
 publish = false
 
 [dependencies]
-tonic-build = { version = "0.10", default-features = false, features = [
+tonic-build = { version = "0.11", default-features = false, features = [
     "prost", "transport"
 ] }
 clap = { version = "~4.1.14", features = ["derive"] }