diff --git a/etc/api/shared.yaml b/etc/api/shared.yaml index 13ffbdaa3c..185b85f02a 100644 --- a/etc/api/shared.yaml +++ b/etc/api/shared.yaml @@ -65,14 +65,8 @@ directories: mako_src: src/mako # The subdirectory to contain documentation from all APIs and related programs doc_subdir: doc -# This somewhat intricate setup allows the CLI to access certain cargo-API values, -# without having us duplicate them. -cargo_api: &cargo_api - build_version: "1.0.0" cargo: - # This means that the API must not specify the shared variables from cargo_api - # anymore - <<: *cargo_api + build_version: "1.0.0" 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 995f898d2f..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.0" 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 9332951699..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.0" 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 1271980e84..25b3831720 100644 --- a/src/mako/Cargo.toml.mako +++ b/src/mako/Cargo.toml.mako @@ -48,8 +48,7 @@ ${dep} if make.depends_on_suffix is not None: crate_name_we_depend_on = library_to_crate_name(api_name, suffix=make.depends_on_suffix) - depends_on_key = 'cargo_' + make.depends_on_id - crate_version_we_depend_on = self.context.get(depends_on_key).get('build_version') + crate_version_we_depend_on = cargo.build_version nightly_features.append(crate_name_we_depend_on + '/nightly') default_features.append(crate_name_we_depend_on + '/with-serde-codegen') %>\