Skip to content

Commit

Permalink
update depedencies
Browse files Browse the repository at this point in the history
  • Loading branch information
sagiegurari committed Jun 30, 2017
1 parent 4a3d6e4 commit 92b51b8
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 17 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo-make"
version = "0.2.12"
version = "0.2.13"
authors = ["Sagie Gur-Ari <[email protected]>"]
description = "Rust task runner and build tool."
license = "Apache-2.0"
Expand All @@ -25,8 +25,8 @@ include = [
[dependencies]
clap = "^2.25.0"
rand = "^0.3.15"
serde = "^1.0.8"
serde_derive = "^1.0.8"
serde = "*" #actual value defined by toml dependency
serde_derive = "^1.0.9"
toml = "^0.4.2"

[features]
Expand Down
4 changes: 4 additions & 0 deletions Makefile.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

[tasks.outdated]
#do not break due to child outdated dependencies also used as root dependencies
args = ["outdated", "--root-deps-only", "--exit-code", "0"]
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -454,12 +454,12 @@ OPTIONS:
<a name="descriptor-definition"></a>
## Makefile Definition
````rust
/// Holds the entire configuration such as task definitions and env vars
pub struct Config {
/// Holds the entire externally read configuration such as task definitions and env vars where all values are optional
pub struct ExternalConfig {
/// The env vars to setup before running the tasks
pub env: HashMap<String, String>,
pub env: Option<HashMap<String, String>>,
/// All task definitions
pub tasks: HashMap<String, Task>
pub tasks: Option<HashMap<String, Task>>
}

/// Holds a single task configuration such as command and dependencies list
Expand Down Expand Up @@ -604,6 +604,7 @@ See [contributing guide](.github/CONTRIBUTING.md)

| Date | Version | Description |
| ----------- | ------- | ----------- |
| 2017-06-30 | v0.2.13 | Maintenance |
| 2017-06-28 | v0.2.12 | Published website |
| 2017-06-28 | v0.2.8 | Platform specific task override |
| 2017-06-26 | v0.2.7 | Platform specific alias |
Expand Down
8 changes: 4 additions & 4 deletions docs/_includes/content.md
Original file line number Diff line number Diff line change
Expand Up @@ -426,12 +426,12 @@ OPTIONS:
<a name="descriptor-definition"></a>
# Makefile Definition
````rust
/// Holds the entire configuration such as task definitions and env vars
pub struct Config {
/// Holds the entire externally read configuration such as task definitions and env vars where all values are optional
pub struct ExternalConfig {
/// The env vars to setup before running the tasks
pub env: HashMap<String, String>,
pub env: Option<HashMap<String, String>>,
/// All task definitions
pub tasks: HashMap<String, Task>
pub tasks: Option<HashMap<String, Task>>
}

/// Holds a single task configuration such as command and dependencies list
Expand Down
6 changes: 3 additions & 3 deletions docs/api/src/cargo_make/types.rs.html
Original file line number Diff line number Diff line change
Expand Up @@ -387,14 +387,14 @@
<span class="kw">impl</span> <span class="ident">Task</span> {
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">new</span>() <span class="op">-&gt;</span> <span class="ident">Task</span> {
<span class="ident">Task</span> {
<span class="ident">install_crate</span>: <span class="prelude-val">None</span>,
<span class="ident">command</span>: <span class="prelude-val">None</span>,
<span class="ident">disabled</span>: <span class="prelude-val">None</span>,
<span class="ident">alias</span>: <span class="prelude-val">None</span>,
<span class="ident">linux_alias</span>: <span class="prelude-val">None</span>,
<span class="ident">windows_alias</span>: <span class="prelude-val">None</span>,
<span class="ident">mac_alias</span>: <span class="prelude-val">None</span>,
<span class="ident">install_crate</span>: <span class="prelude-val">None</span>,
<span class="ident">install_script</span>: <span class="prelude-val">None</span>,
<span class="ident">command</span>: <span class="prelude-val">None</span>,
<span class="ident">args</span>: <span class="prelude-val">None</span>,
<span class="ident">script</span>: <span class="prelude-val">None</span>,
<span class="ident">dependencies</span>: <span class="prelude-val">None</span>,
Expand Down Expand Up @@ -613,7 +613,7 @@
}

<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Serialize</span>, <span class="ident">Deserialize</span>, <span class="ident">Debug</span>)]</span>
<span class="doccomment">/// Same as the config struct but all memebers are optional</span>
<span class="doccomment">/// Holds the entire externally read configuration such as task definitions and env vars where all values are optional</span>
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">ExternalConfig</span> {
<span class="doccomment">/// The env vars to setup before running the tasks</span>
<span class="kw">pub</span> <span class="ident">env</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">HashMap</span><span class="op">&lt;</span><span class="ident">String</span>, <span class="ident">String</span><span class="op">&gt;&gt;</span>,
Expand Down
6 changes: 3 additions & 3 deletions src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ pub struct Task {
impl Task {
pub fn new() -> Task {
Task {
install_crate: None,
command: None,
disabled: None,
alias: None,
linux_alias: None,
windows_alias: None,
mac_alias: None,
install_crate: None,
install_script: None,
command: None,
args: None,
script: None,
dependencies: None,
Expand Down Expand Up @@ -271,7 +271,7 @@ pub struct Config {
}

#[derive(Serialize, Deserialize, Debug)]
/// Same as the config struct but all memebers are optional
/// Holds the entire externally read configuration such as task definitions and env vars where all values are optional
pub struct ExternalConfig {
/// The env vars to setup before running the tasks
pub env: Option<HashMap<String, String>>,
Expand Down

0 comments on commit 92b51b8

Please sign in to comment.