diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml index a222f9c2..c57b8ac6 100644 --- a/actix-server/Cargo.toml +++ b/actix-server/Cargo.toml @@ -36,7 +36,7 @@ slab = "0.4" tokio = { version = "1", features = ["sync"] } [dev-dependencies] -actix-testing = "1.0.0" +actix-testing = "2.0.0-beta.1" bytes = "1" env_logger = "0.8" futures-util = { version = "0.3.7", default-features = false, features = ["sink"] } diff --git a/actix-testing/CHANGES.md b/actix-testing/CHANGES.md index 86a79ed7..f23c7521 100644 --- a/actix-testing/CHANGES.md +++ b/actix-testing/CHANGES.md @@ -1,33 +1,37 @@ # Changes -## [1.0.1] - 2020-05-19 +## Unreleased - 2021-xx-xx + +## 2.0.0-beta.1 - 2020-12-28 +* Update `actix-server` to v2.0.0-beta.1. + + +## 1.0.1 - 2020-05-19 * Replace deprecated `net2` crate with `socket2` - * Remove unused `futures` dependency -## [1.0.0] - 2019-12-11 +## 1.0.0 - 2019-12-11 * Update actix-server to 1.0.0 -## [1.0.0-alpha.3] - 2019-12-07 +## 1.0.0-alpha.3 - 2019-12-07 * Migrate to tokio 0.2 -## [1.0.0-alpha.2] - 2019-12-02 +## 1.0.0-alpha.2 - 2019-12-02 * Re-export `test` attribute macros -## [0.3.0-alpha.1] - 2019-11-22 +## 0.3.0-alpha.1 - 2019-11-22 * Migrate to std::future -## [0.2.0] - 2019-10-14 +## 0.2.0 - 2019-10-14 * Upgrade actix-server and actix-server-config deps -## [0.1.0] - 2019-09-25 - +## 0.1.0 - 2019-09-25 * Initial impl diff --git a/actix-testing/Cargo.toml b/actix-testing/Cargo.toml index 17855a24..3f29679e 100644 --- a/actix-testing/Cargo.toml +++ b/actix-testing/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "actix-testing" -version = "1.0.1" +version = "2.0.0-beta.1" authors = ["Nikolay Kim "] -description = "Actix testing utils" +description = "Various helpers for Actix applications to use during testing" keywords = ["network", "framework", "async", "futures"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-net.git" @@ -10,7 +10,6 @@ documentation = "https://docs.rs/actix-testing/" categories = ["network-programming", "asynchronous"] license = "MIT OR Apache-2.0" edition = "2018" -workspace = ".." readme = "README.md" [lib] @@ -20,7 +19,7 @@ path = "src/lib.rs" [dependencies] actix-rt = "2.0.0-beta.1" actix-macros = "0.1.0" -actix-server = "1.0.0" +actix-server = "2.0.0-beta.1" actix-service = "2.0.0-beta.1" log = "0.4" diff --git a/actix-testing/README.md b/actix-testing/README.md index bd4eec2f..ae54b46d 100644 --- a/actix-testing/README.md +++ b/actix-testing/README.md @@ -6,4 +6,4 @@ * [API Documentation](https://docs.rs/actix-testing/) * [Chat on gitter](https://gitter.im/actix/actix) * Cargo package: [actix-http-test](https://crates.io/crates/actix-testing) -* Minimum supported Rust version: 1.37 or later +* Minimum supported Rust version: 1.46 or later diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml index 801f6144..dcd5978a 100644 --- a/actix-tls/Cargo.toml +++ b/actix-tls/Cargo.toml @@ -59,6 +59,6 @@ tokio-tls = { version = "0.3", optional = true } bytes = "0.5" log = "0.4" env_logger = "0.7" -actix-testing = "1.0.0" -actix-server = "1" +actix-testing = "2.0.0-beta.1" +actix-server = "2.0.0-beta.1" actix-rt = "1"