Update Actix to the latest version (#761)

* actix updated to latest version and actix rt removed

* actix rt added back as dev dep

Author: kunjee17

examples/actix_subscriptions/Cargo.toml

@@ -6,9 +6,8 @@ edition = "2018"
 publish = false
 
 [dependencies]
-actix-web = "2.0.0"
-actix-rt = "1.1.1"
-actix-cors = "0.2.0"
+actix-web = "3.0.0"
+actix-cors = "0.3.0"
 
 futures = "0.3.5"
 tokio = { version = "0.2", features = ["rt-core", "macros"] }

examples/actix_subscriptions/src/main.rs

@@ -104,7 +104,7 @@ async fn subscriptions(
     subscriptions_handler(req, stream, schema, config).await
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     env::set_var("RUST_LOG", "info");
     env_logger::init();

juniper_actix/CHANGELOG.md

@@ -1,3 +1,4 @@
 # master
+- Actix package updated to 3.0.0
 - Subscription support
 - Initial Release

juniper_actix/Cargo.toml

@@ -12,14 +12,14 @@ edition = "2018"
 subscriptions = ["juniper_graphql_ws"]
 
 [dependencies]
-actix = "0.9.0"
-actix-rt = "1.1.1"
-actix-web = { version = "2.0.0", features = ["rustls"] }
-actix-web-actors = "2.0.0"
+actix = "0.10.0"
+actix-web = { version = "3.0.0", features = ["rustls"] }
+actix-web-actors = "3.0.0"
+
 
 futures = { version = "0.3.5", features = ["compat"] }
 tokio = { version = "0.2", features = ["time"] }
-serde = { version = "1.0.115", features = ["derive"] }
+serde = { version = "1.0.116", features = ["derive"] }
 serde_json = "1.0.57"
 anyhow = "1.0"
 thiserror = "1.0"
@@ -28,8 +28,9 @@ juniper = { version = "0.14.2", path = "../juniper", default-features = false  }
 juniper_graphql_ws = { path = "../juniper_graphql_ws", optional = true }
 
 [dev-dependencies]
-actix-cors = "0.2.0"
-actix-identity = "0.2.1"
+actix-rt = "1.1.1"
+actix-cors = "0.3.0"
+actix-identity = "0.3.0"
 
 bytes = "0.5.6"
 env_logger = "0.7.1"

juniper_actix/examples/actix_server.rs

@@ -37,7 +37,7 @@ async fn graphql(
     graphql_handler(&schema, &context, req, payload).await
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     env::set_var("RUST_LOG", "info");
     env_logger::init();

juniper_actix/src/lib.rs

@@ -517,13 +517,13 @@ mod tests {
         graphql_handler(&schema, &context, req, payload).await
     }
 
-    #[actix_rt::test]
+    #[actix_web::rt::test]
     async fn graphiql_response_does_not_panic() {
         let result = graphiql_handler("/abcd", None).await;
         assert!(result.is_ok())
     }
 
-    #[actix_rt::test]
+    #[actix_web::rt::test]
     async fn graphiql_endpoint_matches() {
         async fn graphql_handler() -> Result<HttpResponse, Error> {
             graphiql_handler("/abcd", None).await
@@ -539,7 +539,7 @@ mod tests {
         assert_eq!(resp.status(), http::StatusCode::OK);
     }
 
-    #[actix_rt::test]
+    #[actix_web::rt::test]
     async fn graphiql_endpoint_returns_graphiql_source() {
         async fn graphql_handler() -> Result<HttpResponse, Error> {
             graphiql_handler("/dogs-api/graphql", Some("/dogs-api/subscriptions")).await
@@ -564,7 +564,7 @@ mod tests {
         ))
     }
 
-    #[actix_rt::test]
+    #[actix_web::rt::test]
     async fn playground_endpoint_matches() {
         async fn graphql_handler() -> Result<HttpResponse, Error> {
             playground_handler("/abcd", None).await
@@ -580,7 +580,7 @@ mod tests {
         assert_eq!(resp.status(), http::StatusCode::OK);
     }
 
-    #[actix_rt::test]
+    #[actix_web::rt::test]
     async fn playground_endpoint_returns_playground_source() {
         async fn graphql_handler() -> Result<HttpResponse, Error> {
             playground_handler("/dogs-api/graphql", Some("/dogs-api/subscriptions")).await
@@ -602,7 +602,7 @@ mod tests {
         assert!(body.contains("GraphQLPlayground.init(root, { endpoint: '/dogs-api/graphql', subscriptionEndpoint: '/dogs-api/subscriptions' })"));
     }
 
-    #[actix_rt::test]
+    #[actix_web::rt::test]
     async fn graphql_post_works_json_post() {
         let schema: Schema = RootNode::new(
             Query,
@@ -634,7 +634,7 @@ mod tests {
         );
     }
 
-    #[actix_rt::test]
+    #[actix_web::rt::test]
     async fn graphql_get_works() {
         let schema: Schema = RootNode::new(
             Query,
@@ -663,7 +663,7 @@ mod tests {
         );
     }
 
-    #[actix_rt::test]
+    #[actix_web::rt::test]
     async fn batch_request_works() {
         use juniper::{
             tests::fixtures::starwars::{model::Database, schema::Query},
@@ -715,7 +715,7 @@ mod tests {
 
     impl TestActixWebIntegration {
         fn make_request(&self, req: test::TestRequest) -> TestResponse {
-            actix_rt::System::new("request").block_on(async move {
+            actix_web::rt::System::new("request").block_on(async move {
                 let schema = RootNode::new(
                     Query,
                     EmptyMutation::<Database>::new(),
@@ -877,7 +877,7 @@ mod subscription_tests {
         subscriptions_handler(req, stream, schema, config).await
     }
 
-    #[actix_rt::test]
+    #[actix_web::rt::test]
     async fn test_actix_ws_integration() {
         run_ws_test_suite(&mut TestActixWsIntegration::default()).await;
     }