Merge branch 'develop' into unstable

# Conflicts: # README.md
Tamschi · Oct 21, 2021 · 8c8bb22 · 8c8bb22
2 parents d916291 + ccfae35
commit 8c8bb22
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -35,7 +35,7 @@ If applicable, add screenshots to help explain your problem.
 **please complete the following information:**
 
 - `rustc --version`: [e.g. 1.53.0]
-- Crate version (if applicable): [e.g. 0.0.3]
+- Crate version (if applicable): [e.g. 0.0.4]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 <!-- markdownlint-disable no-trailing-punctuation -->
 
+## 0.0.4
+
+2021-10-21
+
+- Revisions:
+  - Corrected the `package.license` field in Cargo.toml. Sorry about that.
+
 ## 0.0.3
 
 2021-10-21

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "reserde"
-version = "0.0.3"
+version = "0.0.4"
 authors = ["Tamme Schichler <tamme@schichler.dev>"]
 edition = "2018"
 description = "Serde-based CLI document converter (Bencode, CBOR, JSON, TAML, x-www-form-urlencoded etc.)"
-license = "AGPL-3.0-or-later"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/Tamschi/reserde"
-homepage = "https://github.com/Tamschi/reserde/tree/v0.0.3"
-documentation = "https://docs.rs/reserde/0.0.3"
+homepage = "https://github.com/Tamschi/reserde/tree/v0.0.4"
+documentation = "https://docs.rs/reserde/0.0.4"
 keywords = ["Serde", "cli", "converter"]
 categories = ["command-line-utilities", "encoding"]
 readme = "README.md"

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 ![Rust 1.53](https://img.shields.io/static/v1?logo=Rust&label=&message=1.53&color=grey)
 [![CI](https://github.com/Tamschi/reserde/workflows/CI/badge.svg?branch=unstable)](https://github.com/Tamschi/reserde/actions?query=workflow%3ACI+branch%3Aunstable)
-![Crates.io - License](https://img.shields.io/crates/l/reserde/0.0.3)
+![Crates.io - License](https://img.shields.io/crates/l/reserde/0.0.4)
 
 [![GitHub](https://img.shields.io/static/v1?logo=GitHub&label=&message=%20&color=grey)](https://github.com/Tamschi/reserde)
 [![open issues](https://img.shields.io/github/issues-raw/Tamschi/reserde)](https://github.com/Tamschi/reserde/issues)
@@ -33,7 +33,7 @@ reserde --help
 ```
 
 ```txt
-reserde 0.0.3
+reserde 0.0.4
 Transcode a self-describing format into a different format.
 
 Currently supports Bencode, Bincode (--out only), CBOR, JSON (--pretty), TAML (--in only), XML, x-www-form-urlencoded

diff --git a/SECURITY.md b/SECURITY.md
@@ -4,7 +4,7 @@
 
 | Version | Supported          | ***Initial*** Reason for Removal |
 | ------- | ------------------ | -------------------------------- |
-| 0.0.1-3 | :white_check_mark: |                                  |
+| 0.0.1-4 | :white_check_mark: |                                  |
 
 Faulty versions are [yanked](https://doc.rust-lang.org/cargo/commands/cargo-yank.html), where possible after a Semver-compatible update is made available, and added to the table above as unsupported.  
 They are also marked with an additional `v….….…-yanked` tag in Git to make them easily recognisable, but original release tags are not removed.

diff --git a/src/main.rs b/src/main.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/reserde/0.0.3")]
+#![doc(html_root_url = "https://docs.rs/reserde/0.0.4")]
 #![warn(clippy::pedantic)]
 
 use serde_detach::detach;