Skip to content

Commit ff7575c

Browse files
fix(openapiv3-indexmap): support indexmap 2
Latest openapiv3 became "too flexible" for indexmap dep: ">=1.6.1, <3.0.0" This causes issues with paperclip because we use 1.0. Upgrade to indexmap v2 Signed-off-by: Tiago Castro <[email protected]>
1 parent 80b25af commit ff7575c

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [0.9.0] - Unreleased
8+
### Fixed
9+
- Support latest openapiv3 and indexmap. [PR#507](https://github.com/paperclip-rs/paperclip/pull/507)
10+
711
## [0.8.2] - 2023-09-27
812
### Fixed
913
- Pin openapiv3 to wa breaking change. [PR#508](https://github.com/paperclip-rs/paperclip/pull/508)

Cargo.toml

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "paperclip"
3-
version = "0.8.2"
3+
version = "0.9.0"
44
edition = "2018"
55
description = "OpenAPI tooling library for type-safe compile-time checked HTTP APIs"
66
documentation = "https://paperclip-rs.github.io/paperclip/paperclip"
@@ -17,8 +17,8 @@ path = "src/bin/main.rs"
1717
required-features = ["cli"]
1818

1919
[dependencies]
20-
paperclip-actix = { path = "plugins/actix-web", version = "0.6.2", optional = true }
21-
paperclip-core = { path = "core", version = "0.6.2" }
20+
paperclip-actix = { path = "plugins/actix-web", version = "0.7.0", optional = true }
21+
paperclip-core = { path = "core", version = "0.7.0" }
2222
paperclip-macros = { path = "macros", version = "0.6.3", optional = true }
2323

2424
env_logger = { version = "0.8", optional = true }
@@ -40,8 +40,7 @@ url_dep = { version = ">=1.7,<3", package = "url" }
4040
thiserror = "1.0"
4141
anyhow = "1.0"
4242
once_cell = "1.4"
43-
openapiv3 = { version = "=1.0.2", optional = true }
44-
indexmap = { version = "1.0", features = ["serde-1", "std"], optional = true }
43+
openapiv3 = { version = "1.0.3", optional = true }
4544

4645
[dev-dependencies]
4746
actix-rt1 = { version = "1.0", package = "actix-rt" }
@@ -83,7 +82,7 @@ cli = ["env_logger", "structopt", "git2", "v2", "codegen"]
8382
codegen = ["heck", "http", "log", "regex", "tinytemplate", "paperclip-core/codegen"]
8483
v2 = ["paperclip-macros/v2", "paperclip-core/v2"]
8584
# OpenAPI v2 to v3 support
86-
v3 = ["openapiv3", "indexmap", "v2", "paperclip-core/v3", "paperclip-actix/v3"]
85+
v3 = ["openapiv3", "v2", "paperclip-core/v3", "paperclip-actix/v3"]
8786

8887

8988
# Features for implementing traits for dependencies.

core/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "paperclip-core"
3-
version = "0.6.2"
3+
version = "0.7.0"
44
edition = "2018"
55
description = "Core types and traits for paperclip OpenAPI tooling library"
66
documentation = "https://paperclip-rs.github.io/paperclip/paperclip_core"
@@ -37,8 +37,8 @@ actix-web-validator2 = { version = "2.2", optional = true, package = "actix-web-
3737
actix-web-validator3 = { version = "3.0", optional = true, package = "actix-web-validator" }
3838
validator12 = { version = "0.12", features = ["derive"], optional = true, package = "validator" }
3939
validator14 = { version = "0.14", features = ["derive"], optional = true, package = "validator" }
40-
openapiv3 = { version = "=1.0.2", optional = true }
41-
indexmap = { version = "1.0", features = ["serde-1", "std"], optional = true }
40+
openapiv3 = { version = "1.0.3", optional = true }
41+
indexmap = { version = "2.0", features = ["serde"], optional = true }
4242

4343
[features]
4444
# actix-web support

plugins/actix-web/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "paperclip-actix"
3-
version = "0.6.2"
3+
version = "0.7.0"
44
edition = "2018"
55
description = "Paperclip OpenAPI plugin for actix-web framework"
66
documentation = "https://paperclip-rs.github.io/paperclip/paperclip_actix"
@@ -9,7 +9,7 @@ homepage = "https://github.com/paperclip-rs/paperclip"
99
repository = "https://github.com/paperclip-rs/paperclip"
1010

1111
[dependencies]
12-
paperclip-core = { path = "../../core", version = "0.6.2", optional = true }
12+
paperclip-core = { path = "../../core", version = "0.7.0", optional = true }
1313
paperclip-macros = { path = "../../macros", version = "0.6.3", features = ["actix"] }
1414
futures = "0.3"
1515
actix-service1 = { version = "1", package = "actix-service", optional = true }
@@ -20,7 +20,7 @@ actix-web4 = { version = "4", default-features = false, optional = true, package
2020
mime_guess = { version = "2.0.4", default-features = false }
2121
serde_json = "1.0"
2222
once_cell = "1.4"
23-
openapiv3 = { version = "=1.0.2", optional = true }
23+
openapiv3 = { version = "1.0.3", optional = true }
2424
include_dir = { version = "0.7.2", optional = true }
2525
tinytemplate = { version = "1.1", optional = true }
2626

0 commit comments

Comments
 (0)