From f3b5f379a83bcb4b881b63ccfc0a12ca64866cdb Mon Sep 17 00:00:00 2001 From: Ben King <9087625+benfdking@users.noreply.github.com> Date: Mon, 29 Jul 2024 16:39:20 +0100 Subject: [PATCH] chore: centralise cargo settings and bump --- .hacking/scripts/check_versions_match.sh | 14 ++------------ Cargo.lock | 12 ++++++------ Cargo.toml | 6 ++++++ js/packages/quary-extension/package.json | 2 +- rust/cli/Cargo.toml | 7 ++++--- rust/core/Cargo.toml | 7 ++++--- rust/dbt-converter/Cargo.toml | 7 ++++--- rust/quary-databases/Cargo.toml | 7 ++++--- rust/sqlinference/Cargo.toml | 7 ++++--- rust/wasm-binding/Cargo.toml | 7 ++++--- 10 files changed, 39 insertions(+), 37 deletions(-) diff --git a/.hacking/scripts/check_versions_match.sh b/.hacking/scripts/check_versions_match.sh index e91347e8..f0050d65 100755 --- a/.hacking/scripts/check_versions_match.sh +++ b/.hacking/scripts/check_versions_match.sh @@ -1,12 +1,7 @@ #!/bin/bash # Extract version from Cargo.toml -cargo_version_cli=$(grep "^version" rust/cli/Cargo.toml | awk -F '"' '{print $2}') -cargo_version_core=$(grep "^version" rust/core/Cargo.toml | awk -F '"' '{print $2}') -cargo_version_databases=$(grep "^version" rust/quary-databases/Cargo.toml | awk -F '"' '{print $2}') -cargo_version_dbt=$(grep "^version" rust/dbt-converter/Cargo.toml | awk -F '"' '{print $2}') -cargo_version_sqlinference=$(grep "^version" rust/sqlinference/Cargo.toml | awk -F '"' '{print $2}') -cargo_version_wasm=$(grep "^version" rust/wasm-binding/Cargo.toml | awk -F '"' '{print $2}') +cargo_version=$(grep "^version" Cargo.toml | awk -F '"' '{print $2}') # Extract version from package.json ts_version=$(jq -r '.version' js/packages/quary-extension/package.json) @@ -22,12 +17,7 @@ compare_versions() { fi } -compare_versions "$cargo_version_cli" "$ts_version" -compare_versions "$cargo_version_core" "$ts_version" -compare_versions "$cargo_version_databases" "$ts_version" -compare_versions "$cargo_version_dbt" "$ts_version" -compare_versions "$cargo_version_sqlinference" "$ts_version" -compare_versions "$cargo_version_wasm" "$ts_version" +compare_versions "$cargo_version" "$ts_version" # If GitHub release version is provided, compare it as well if [ -n "$github_release_version" ]; then diff --git a/Cargo.lock b/Cargo.lock index eb35a034..c4bf3ca9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1042,7 +1042,7 @@ checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "dbt-converter" -version = "0.3.3" +version = "0.4.0" dependencies = [ "quary_proto", "regex", @@ -3021,7 +3021,7 @@ dependencies = [ [[package]] name = "quary" -version = "0.3.3" +version = "0.4.0" dependencies = [ "assert_cmd", "async-trait", @@ -3047,7 +3047,7 @@ dependencies = [ [[package]] name = "quary-core" -version = "0.3.3" +version = "0.4.0" dependencies = [ "async-trait", "chrono", @@ -3072,7 +3072,7 @@ dependencies = [ [[package]] name = "quary-databases" -version = "0.3.3" +version = "0.4.0" dependencies = [ "assert_cmd", "async-trait", @@ -3097,7 +3097,7 @@ dependencies = [ [[package]] name = "quary-wasm-bindgen" -version = "0.3.3" +version = "0.4.0" dependencies = [ "async-trait", "chrono", @@ -4092,7 +4092,7 @@ dependencies = [ [[package]] name = "sqlinference" -version = "0.3.3" +version = "0.4.0" dependencies = [ "sqlparser", ] diff --git a/Cargo.toml b/Cargo.toml index 5cbb3b6e..e2516be5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,5 +10,11 @@ members = [ ] resolver = "2" +[workspace.package] +version = "0.4.0" +edition = "2021" +license = "Apache-2.0" +rust-version = "1.80.0" + [workspace.dependencies] cargo-nextest = "0.9" \ No newline at end of file diff --git a/js/packages/quary-extension/package.json b/js/packages/quary-extension/package.json index c1d2c7d2..93d4d2e9 100644 --- a/js/packages/quary-extension/package.json +++ b/js/packages/quary-extension/package.json @@ -5,7 +5,7 @@ "description": "", "repository": "https://github.com/quarylabs/quary", "icon": "images/quary-logo.png", - "version": "0.3.3", + "version": "0.4.0", "engines": { "vscode": "^1.91.0" }, diff --git a/rust/cli/Cargo.toml b/rust/cli/Cargo.toml index 562ac5c3..7ea5703e 100644 --- a/rust/cli/Cargo.toml +++ b/rust/cli/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "quary" -version = "0.3.3" -edition = "2021" -rust-version = "1.80.0" +version.workspace = true +edition.workspace = true +license.workspace = true +rust-version.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/rust/core/Cargo.toml b/rust/core/Cargo.toml index 68184660..ce4176c7 100644 --- a/rust/core/Cargo.toml +++ b/rust/core/Cargo.toml @@ -1,9 +1,10 @@ [package] name = "quary-core" -version = "0.3.3" authors = ["Ben King <9087625+benfdking@users.noreply.github.com>"] -edition = "2021" -rust-version = "1.80.0" +version.workspace = true +edition.workspace = true +license.workspace = true +rust-version.workspace = true [lib] crate-type = ["cdylib", "rlib"] diff --git a/rust/dbt-converter/Cargo.toml b/rust/dbt-converter/Cargo.toml index 735b42f2..17b54ea3 100644 --- a/rust/dbt-converter/Cargo.toml +++ b/rust/dbt-converter/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "dbt-converter" -version = "0.3.3" -edition = "2021" -rust-version = "1.80.0" +version.workspace = true +edition.workspace = true +license.workspace = true +rust-version.workspace = true [dependencies] serde_yaml = "0.9" diff --git a/rust/quary-databases/Cargo.toml b/rust/quary-databases/Cargo.toml index 1e6be864..a4a235a7 100644 --- a/rust/quary-databases/Cargo.toml +++ b/rust/quary-databases/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "quary-databases" -version = "0.3.3" -edition = "2021" -rust-version = "1.80.0" +version.workspace = true +edition.workspace = true +license.workspace = true +rust-version.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/rust/sqlinference/Cargo.toml b/rust/sqlinference/Cargo.toml index bcea9da2..23764491 100644 --- a/rust/sqlinference/Cargo.toml +++ b/rust/sqlinference/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "sqlinference" -version = "0.3.3" -edition = "2021" -rust-version = "1.80.0" +version.workspace = true +edition.workspace = true +license.workspace = true +rust-version.workspace = true [lib] diff --git a/rust/wasm-binding/Cargo.toml b/rust/wasm-binding/Cargo.toml index 07fcd770..201f9a2b 100644 --- a/rust/wasm-binding/Cargo.toml +++ b/rust/wasm-binding/Cargo.toml @@ -1,9 +1,10 @@ [package] name = "quary-wasm-bindgen" -version = "0.3.3" authors = ["Ben King <9087625+benfdking@users.noreply.github.com>"] -edition = "2021" -rust-version = "1.80.0" +version.workspace = true +edition.workspace = true +license.workspace = true +rust-version.workspace = true [lib] crate-type = ["cdylib", "rlib"]