diff --git a/CHANGELOG.md b/CHANGELOG.md index 12920b2..4742e7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.0.0-alpha.7] - 2024-08-19 + +### Fixed + +- Fix behaviour of `flatten` for schemas with `additionalProperties` +- Fix behaviour of `flatten` of multiple enums (https://github.com/GREsau/schemars/issues/165 / https://github.com/GREsau/schemars/pull/320) + ## [1.0.0-alpha.6] - 2024-08-17 ### Fixed diff --git a/Cargo.lock b/Cargo.lock index db5fe23..a53924d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -309,7 +309,7 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "schemars" -version = "1.0.0-alpha.6" +version = "1.0.0-alpha.7" dependencies = [ "arrayvec", "bigdecimal", @@ -335,7 +335,7 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "1.0.0-alpha.6" +version = "1.0.0-alpha.7" dependencies = [ "pretty_assertions", "proc-macro2", diff --git a/README.md b/README.md index 7376f0e..61f2893 100644 --- a/README.md +++ b/README.md @@ -281,5 +281,5 @@ For example, to implement `JsonSchema` on types from `chrono`, enable it as a fe ```toml [dependencies] -schemars = { version = "1.0.0-alpha.6", features = ["chrono04"] } +schemars = { version = "1.0.0-alpha.7", features = ["chrono04"] } ``` diff --git a/docs/4-features.md b/docs/4-features.md index cb6e9c7..66ed1e2 100644 --- a/docs/4-features.md +++ b/docs/4-features.md @@ -30,5 +30,5 @@ For example, to implement `JsonSchema` on types from `chrono`, enable it as a fe ```toml [dependencies] -schemars = { version = "1.0.0-alpha.6", features = ["chrono04"] } +schemars = { version = "1.0.0-alpha.7", features = ["chrono04"] } ``` diff --git a/schemars/Cargo.toml b/schemars/Cargo.toml index 9579476..6b97d41 100644 --- a/schemars/Cargo.toml +++ b/schemars/Cargo.toml @@ -3,7 +3,7 @@ name = "schemars" description = "Generate JSON Schemas from Rust code" homepage = "https://graham.cool/schemars/" repository = "https://github.com/GREsau/schemars" -version = "1.0.0-alpha.6" +version = "1.0.0-alpha.7" authors = ["Graham Esau "] edition = "2021" license = "MIT" @@ -13,7 +13,7 @@ categories = ["encoding", "no-std"] rust-version = "1.60" [dependencies] -schemars_derive = { version = "=1.0.0-alpha.6", optional = true, path = "../schemars_derive" } +schemars_derive = { version = "=1.0.0-alpha.7", optional = true, path = "../schemars_derive" } serde = { version = "1.0", default-features = false, features = ["alloc"]} serde_json = { version = "1.0.122", default-features = false, features = ["alloc"] } dyn-clone = "1.0" diff --git a/schemars_derive/Cargo.toml b/schemars_derive/Cargo.toml index 4f20d8c..89b69df 100644 --- a/schemars_derive/Cargo.toml +++ b/schemars_derive/Cargo.toml @@ -3,7 +3,7 @@ name = "schemars_derive" description = "Macros for #[derive(JsonSchema)], for use with schemars" homepage = "https://graham.cool/schemars/" repository = "https://github.com/GREsau/schemars" -version = "1.0.0-alpha.6" +version = "1.0.0-alpha.7" authors = ["Graham Esau "] edition = "2021" license = "MIT"