Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accept productName/productVersion flags #70

Merged
merged 3 commits into from
Sep 6, 2019
Merged

Accept productName/productVersion flags #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac57fdc
Accept productName/productVersion flags
sfackler Sep 6, 2019
c885168
Add generated changelog entries
sfackler Sep 6, 2019
695f341
Release v0.4.5
sfackler Sep 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions changelog/@unreleased/pr-70.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
type: fix
fix:
description: The generator now accepts `--productName` and `--productVersion` flags
as aliases for `--crateName` and `--crateVersion` respectively.
links:
- https://github.com/palantir/conjure-rust/pull/70
10 changes: 5 additions & 5 deletions conjure-codegen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "conjure-codegen"
version = "0.4.4"
version = "0.4.5"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -21,7 +21,7 @@ quote = { version = "1.0", default-features = false }
proc-macro2 = { version = "1.0", default-features = false }
failure = "0.1"

conjure-object = { version = "0.4.4", path = "../conjure-object" }
conjure-serde = { version = "0.4.4", path = "../conjure-serde" }
conjure-error = { version = "0.4.4", optional = true, path = "../conjure-error" }
conjure-http = { version = "0.4.4", optional = true, path = "../conjure-http" }
conjure-object = { version = "0.4.5", path = "../conjure-object" }
conjure-serde = { version = "0.4.5", path = "../conjure-serde" }
conjure-error = { version = "0.4.5", optional = true, path = "../conjure-error" }
conjure-http = { version = "0.4.5", optional = true, path = "../conjure-http" }
4 changes: 2 additions & 2 deletions conjure-error/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "conjure-error"
version = "0.4.4"
version = "0.4.5"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -15,4 +15,4 @@ serde = "1.0"
serde-value = "0.6"
uuid = { version = "0.7", features = ["v4"] }

conjure-object = { version = "0.4.4", path = "../conjure-object" }
conjure-object = { version = "0.4.5", path = "../conjure-object" }
8 changes: 4 additions & 4 deletions conjure-http/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "conjure-http"
version = "0.4.4"
version = "0.4.5"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -13,6 +13,6 @@ http = "0.1"
lazy_static = "1.0"
serde = "1.0"

conjure-error = { version = "0.4.4", path = "../conjure-error" }
conjure-object = { version = "0.4.4", path = "../conjure-object" }
conjure-serde = { version = "0.4.4", path = "../conjure-serde" }
conjure-error = { version = "0.4.5", path = "../conjure-error" }
conjure-object = { version = "0.4.5", path = "../conjure-object" }
conjure-serde = { version = "0.4.5", path = "../conjure-serde" }
2 changes: 1 addition & 1 deletion conjure-object/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "conjure-object"
version = "0.4.4"
version = "0.4.5"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions conjure-rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "conjure-rust"
version = "0.4.4"
version = "0.4.5"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"
license = "Apache-2.0"

[dependencies]
structopt = "0.3"

conjure-codegen = { version = "0.4.4", path = "../conjure-codegen" }
conjure-codegen = { version = "0.4.5", path = "../conjure-codegen" }
6 changes: 4 additions & 2 deletions conjure-rust/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,17 @@ struct Args {
long = "crate-name",
value_name = "name",
requires = "crate-version",
alias = "crateName"
alias = "crateName",
alias = "productName"
)]
crate_name: Option<String>,
/// The version of the generated crate
#[structopt(
long = "crate-version",
value_name = "version",
requires = "crate-name",
alias = "crateVersion"
alias = "crateVersion",
alias = "productVersion"
)]
crate_version: Option<String>,
#[structopt(name = "input-json", parse(from_os_str))]
Expand Down
2 changes: 1 addition & 1 deletion conjure-serde/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "conjure-serde"
version = "0.4.4"
version = "0.4.5"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion conjure-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "conjure-test"
version = "0.4.4"
version = "0.4.5"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"

Expand Down
6 changes: 3 additions & 3 deletions example-api/Cargo.toml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.