From 75316f4c8400bd778050c44b1574babb074fa82c Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sat, 24 Dec 2016 15:42:39 +0100 Subject: [PATCH] chore(version): api-cli lock-step; depend on specific version As they are usually meant to work hand-in-hand anyway. This simplifies the way this works a lot, and is probably more correct as well. --- etc/api/shared.yaml | 1 + etc/api/type-api.yaml | 1 - etc/api/type-cli.yaml | 1 - src/mako/Cargo.toml.mako | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/etc/api/shared.yaml b/etc/api/shared.yaml index 59007bf9b7..ba7dd13bc5 100644 --- a/etc/api/shared.yaml +++ b/etc/api/shared.yaml @@ -66,6 +66,7 @@ directories: # The subdirectory to contain documentation from all APIs and related programs doc_subdir: doc cargo: + build_version: "1.0.1" repo_base_url: https://github.com/Byron/google-apis-rs authors: # don't forget to possibly add them to copyright authors diff --git a/etc/api/type-api.yaml b/etc/api/type-api.yaml index e48be86561..80f7aa89dc 100644 --- a/etc/api/type-api.yaml +++ b/etc/api/type-api.yaml @@ -25,7 +25,6 @@ make: - source: build.rs output_dir: src cargo: - build_version: "1.0.1" build_script: src/build.rs keywords: [protocol, web, api] doc_base_url: https://docs.rs diff --git a/etc/api/type-cli.yaml b/etc/api/type-cli.yaml index 07275afdb0..f5812e35c8 100644 --- a/etc/api/type-cli.yaml +++ b/etc/api/type-cli.yaml @@ -23,7 +23,6 @@ make: - source: main.rs output_dir: src cargo: - build_version: "1.0.1" keywords: [cli] is_executable: YES doc_base_url: http://byron.github.io/google-apis-rs diff --git a/src/mako/Cargo.toml.mako b/src/mako/Cargo.toml.mako index 8c42178b47..e62c826459 100644 --- a/src/mako/Cargo.toml.mako +++ b/src/mako/Cargo.toml.mako @@ -61,7 +61,7 @@ serde_codegen = { version = "^ 0.8", optional = true } [dependencies.${crate_name_we_depend_on}] path = "../${api_name}" -version = "1" +version = "${util.crate_version()}" optional = true default-features = false % endif