Merge pull request #86 from alexliesenfeld/maintenance

Upgrade dependencies

.github/workflows/build.yml

@@ -48,16 +48,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          ref: master
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build development version
+        if: github.ref != 'refs/heads/master'
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: false
+          tags: alexliesenfeld/httpmock:latest
       - name: Build and push
+        if: github.ref == 'refs/heads/master'
         uses: docker/build-push-action@v4
         with:
           context: .
           push: true
-          tags: alexliesenfeld/httpmock:latest
+          tags: alexliesenfeld/httpmock:latest

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 0.6.8
+
+- This is a maintenance release that updates all dependencies to the most recent version.
+- Fixes some dependency issues with the Docker image.
+
 ## Version 0.6.7
 
 - This is a maintenance release that updates all dependencies to the most recent version.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "httpmock"
-version = "0.6.7"
+version = "0.6.8"
 authors = ["Alexander Liesenfeld <alexander.liesenfeld@outlook.com>"]
 edition = "2018"
 description = "HTTP mocking library for Rust"
@@ -11,44 +11,43 @@ license = "MIT"
 repository = "https://github.com/alexliesenfeld/httpmock"
 
 [dependencies]
-
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_regex = "1.1"
 lazy_static = "1.4"
 hyper = { version = "0.14", features = ["server", "http1", "tcp"] }
-tokio = { version = "1.22", features = ["sync", "macros", "rt-multi-thread", "signal"] }
+tokio = { version = "1.29", features = ["sync", "macros", "rt-multi-thread", "signal"] }
 isahc = "1.7"
 
-base64 = "0.13"
-regex = "1.7"
+base64 = "0.21"
+regex = "1.9"
 log = "0.4"
-url = "2.3"
+url = "2.4"
 assert-json-diff = "2.0"
 async-trait = "0.1"
 async-object-pool = "0.1"
 crossbeam-utils = "0.8"
 futures-util = "0.3"
 similar = "2.2"
 levenshtein = "1.0"
-form_urlencoded = "1.1"
+form_urlencoded = "1.2"
 
 basic-cookies = { version = "0.1", optional = true }
 colored = { version = "2.0", optional = true }
-clap = { version = "4.0", features = ["derive", "env"], optional = true }
-env_logger = { version = "0.9", optional = true }
+clap = { version = "4.3", features = ["derive", "env"], optional = true }
+env_logger = { version = "0.10", optional = true }
 serde_yaml = { version = "0.9", optional = true }
 
 [dev-dependencies]
-env_logger = "0.9"
+env_logger = "0.10"
 tokio-test = "0.4"
 async-std = { version = "1.12", features = ["attributes", "unstable"] }
 isahc = { version = "1.7", features = ["json"] }
-syn = { version = "1.0", features = ["full"] }
+syn = { version = "2.0", features = ["full"] }
 quote = "1.0"
-actix-rt = "2.7"
+actix-rt = "2.8"
 colored = "2.0"
-ureq = "2.5"
+ureq = "2.7"
 
 [features]
 default = ["cookies"]

Dockerfile

@@ -13,7 +13,7 @@ RUN cargo install --features="standalone" --path .
 # ================================================================================
 # Runner
 # ================================================================================
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 RUN apt-get update && apt-get install -y openssl && rm -rf /var/lib/apt/lists/*
 COPY --from=builder /usr/local/cargo/bin/httpmock /usr/local/bin/httpmock
 
@@ -32,6 +32,6 @@ ENV HTTPMOCK_PORT 5000
 # Request history limit.
 ENV HTTPMOCK_REQUEST_HISTORY_LIMIT 100
 
-ENTRYPOINT ["httpmock", "--expose", "true"]
+ENTRYPOINT ["httpmock", "--expose"]
 
 EXPOSE ${HTTPMOCK_PORT}

src/server/mod.rs

@@ -16,7 +16,6 @@ use hyper::{
     Body, HeaderMap, Request as HyperRequest, Response as HyperResponse, Result as HyperResult,
     Server, StatusCode,
 };
-use regex::internal::Input;
 use regex::Regex;
 
 use matchers::generic::SingleValueMatcher;