Skip to content

Commit f3b5f37

Browse files
benfdkingbenfdking
committed
chore: centralise cargo settings and bump
1 parent 6c0cba4 commit f3b5f37

File tree

10 files changed

+39
-37
lines changed

10 files changed

+39
-37
lines changed

‎.hacking/scripts/check_versions_match.sh

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
#!/bin/bash
22

33
# Extract version from Cargo.toml
4-
cargo_version_cli=$(grep "^version" rust/cli/Cargo.toml | awk -F '"' '{print $2}')
5-
cargo_version_core=$(grep "^version" rust/core/Cargo.toml | awk -F '"' '{print $2}')
6-
cargo_version_databases=$(grep "^version" rust/quary-databases/Cargo.toml | awk -F '"' '{print $2}')
7-
cargo_version_dbt=$(grep "^version" rust/dbt-converter/Cargo.toml | awk -F '"' '{print $2}')
8-
cargo_version_sqlinference=$(grep "^version" rust/sqlinference/Cargo.toml | awk -F '"' '{print $2}')
9-
cargo_version_wasm=$(grep "^version" rust/wasm-binding/Cargo.toml | awk -F '"' '{print $2}')
4+
cargo_version=$(grep "^version" Cargo.toml | awk -F '"' '{print $2}')
105

116
# Extract version from package.json
127
ts_version=$(jq -r '.version' js/packages/quary-extension/package.json)
@@ -22,12 +17,7 @@ compare_versions() {
2217
fi
2318
}
2419

25-
compare_versions "$cargo_version_cli" "$ts_version"
26-
compare_versions "$cargo_version_core" "$ts_version"
27-
compare_versions "$cargo_version_databases" "$ts_version"
28-
compare_versions "$cargo_version_dbt" "$ts_version"
29-
compare_versions "$cargo_version_sqlinference" "$ts_version"
30-
compare_versions "$cargo_version_wasm" "$ts_version"
20+
compare_versions "$cargo_version" "$ts_version"
3121

3222
# If GitHub release version is provided, compare it as well
3323
if [ -n "$github_release_version" ]; then

‎Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,11 @@ members = [
1010
]
1111
resolver = "2"
1212

13+
[workspace.package]
14+
version = "0.4.0"
15+
edition = "2021"
16+
license = "Apache-2.0"
17+
rust-version = "1.80.0"
18+
1319
[workspace.dependencies]
1420
cargo-nextest = "0.9"

‎js/packages/quary-extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"description": "",
66
"repository": "https://github.com/quarylabs/quary",
77
"icon": "images/quary-logo.png",
8-
"version": "0.3.3",
8+
"version": "0.4.0",
99
"engines": {
1010
"vscode": "^1.91.0"
1111
},

‎rust/cli/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[package]
22
name = "quary"
3-
version = "0.3.3"
4-
edition = "2021"
5-
rust-version = "1.80.0"
3+
version.workspace = true
4+
edition.workspace = true
5+
license.workspace = true
6+
rust-version.workspace = true
67

78
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
89

‎rust/core/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
[package]
22
name = "quary-core"
3-
version = "0.3.3"
43
authors = ["Ben King <[email protected]>"]
5-
edition = "2021"
6-
rust-version = "1.80.0"
4+
version.workspace = true
5+
edition.workspace = true
6+
license.workspace = true
7+
rust-version.workspace = true
78

89
[lib]
910
crate-type = ["cdylib", "rlib"]

‎rust/dbt-converter/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[package]
22
name = "dbt-converter"
3-
version = "0.3.3"
4-
edition = "2021"
5-
rust-version = "1.80.0"
3+
version.workspace = true
4+
edition.workspace = true
5+
license.workspace = true
6+
rust-version.workspace = true
67

78
[dependencies]
89
serde_yaml = "0.9"

‎rust/quary-databases/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[package]
22
name = "quary-databases"
3-
version = "0.3.3"
4-
edition = "2021"
5-
rust-version = "1.80.0"
3+
version.workspace = true
4+
edition.workspace = true
5+
license.workspace = true
6+
rust-version.workspace = true
67

78
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
89

‎rust/sqlinference/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[package]
22
name = "sqlinference"
3-
version = "0.3.3"
4-
edition = "2021"
5-
rust-version = "1.80.0"
3+
version.workspace = true
4+
edition.workspace = true
5+
license.workspace = true
6+
rust-version.workspace = true
67

78
[lib]
89

‎rust/wasm-binding/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
[package]
22
name = "quary-wasm-bindgen"
3-
version = "0.3.3"
43
authors = ["Ben King <[email protected]>"]
5-
edition = "2021"
6-
rust-version = "1.80.0"
4+
version.workspace = true
5+
edition.workspace = true
6+
license.workspace = true
7+
rust-version.workspace = true
78

89
[lib]
910
crate-type = ["cdylib", "rlib"]

0 commit comments

Comments
 (0)