Merge pull request #4093 from weiznich/bump/libsqlite3-sys0.29

Bump libsqlite3-sys and diffy to newer versions
diesel-rs · Jul 9, 2024 · 5af0b68 · 5af0b68
2 parents 5015faf + f56268c
commit 5af0b68
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@ Increasing the minimal supported Rust version will always be coupled at least wi
 
 ## Unreleased
 
+### Added
+
+* Support for libsqlite3-sys 0.29.0
+
 ## [2.2.0] 2024-05-31
 
 ### Added

diff --git a/Cargo.toml b/Cargo.toml
@@ -35,6 +35,9 @@ members = [
 rust-version = "1.78.0"
 include = ["src/**/*.rs", "tests/**/*.rs", "LICENSE-*", "README.md"]
 
+[workspace.dependencies]
+libsqlite3-sys = "0.29"
+
 # Config for 'cargo dist'
 [workspace.metadata.dist]
 # The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)

diff --git a/diesel/Cargo.toml b/diesel/Cargo.toml
@@ -24,7 +24,7 @@ include = [
 byteorder = { version = "1.0", optional = true }
 chrono = { version = "0.4.20", optional = true, default-features = false, features = ["clock", "std"] }
 libc = { version = "0.2.0", optional = true }
-libsqlite3-sys = { version = ">=0.17.2, <0.29.0", optional = true, features = ["bundled_bindings"] }
+libsqlite3-sys = { version = ">=0.17.2, <0.30.0", optional = true, features = ["bundled_bindings"] }
 mysqlclient-sys = { version = ">=0.2.5, <0.5.0",  optional = true }
 mysqlclient-src = { version = "0.1.0", optional = true }
 pq-sys = { version = ">=0.4.0, <0.7.0", optional = true }

diff --git a/diesel/src/lib.rs b/diesel/src/lib.rs
@@ -155,7 +155,7 @@
 //! with the `bundled` feature as a dependency to your crate so SQLite will be bundled:
 //! ```toml
 //! [dependencies]
-//! libsqlite3-sys = { version = "0.25.2", features = ["bundled"] }
+//! libsqlite3-sys = { version = "0.29", features = ["bundled"] }
 //! ```
 //! - `postgres`: This feature enables the diesel postgres backend. Enabling this feature requires a compatible
 //! copy of `libpq` for your target architecture. This features implies `postgres_backend`

diff --git a/diesel_cli/Cargo.toml b/diesel_cli/Cargo.toml
@@ -44,11 +44,11 @@ heck = "0.5.0"
 serde = { version = "1.0.193", features = ["derive", "std"] }
 toml = "0.8"
 url = { version = "2.2.2" }
-libsqlite3-sys = { version = ">=0.17.2, <0.29.0", optional = true }
+libsqlite3-sys = { workspace = true, optional = true }
 pq-sys = { version = ">=0.4, <0.7.0", optional = true }
 openssl-sys = { version = "0.9.93", features = ["vendored"], optional = true }
 mysqlclient-sys = { version = "0.4.0", optional = true }
-diffy = "0.3.0"
+diffy = "0.4.0"
 regex = "1.0.6"
 serde_regex = "1.1"
 diesel_table_macro_syntax = { version = "0.2", path = "../diesel_table_macro_syntax" }

diff --git a/diesel_tests/Cargo.toml b/diesel_tests/Cargo.toml
@@ -21,7 +21,7 @@ ipnet = { version = "2.5.0" }
 ipnetwork = ">=0.12.2, <0.21.0"
 bigdecimal = ">= 0.0.13, < 0.5.0"
 rand = "0.8.4"
-libsqlite3-sys = { version = "0.28", optional = true }
+libsqlite3-sys = { workspace = true, optional = true }
 pq-sys = { version = "0.6", optional = true }
 pq-src = { version = "0.3", optional = true }
 mysqlclient-sys = { version = "0.4", optional = true }

diff --git a/examples/sqlite/all_about_inserts/Cargo.toml b/examples/sqlite/all_about_inserts/Cargo.toml
@@ -9,7 +9,7 @@ diesel = { version = "2.1.0", path = "../../../diesel", features = ["sqlite", "c
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.68"
 chrono = { version = "0.4.20", default-features = false, features = ["clock", "std"] }
-libsqlite3-sys = { version = "0.28.0", features = ["bundled"] }
+libsqlite3-sys = { workspace = true, features = ["bundled"] }
 
 [lib]
 doc = false
diff --git a/examples/sqlite/getting_started_step_1/Cargo.toml b/examples/sqlite/getting_started_step_1/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 diesel = { version = "2.1.0", path = "../../../diesel", features = ["sqlite"] }
 dotenvy = "0.15"
-libsqlite3-sys = { version = "0.28.0", features = ["bundled"] }
+libsqlite3-sys = { workspace = true, features = ["bundled"] }
 
 [dev-dependencies]
 assert_cmd = "2.0.14"

diff --git a/examples/sqlite/getting_started_step_2/Cargo.toml b/examples/sqlite/getting_started_step_2/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies]
 diesel = { version = "2.1.0", path = "../../../diesel", features = ["sqlite", "returning_clauses_for_sqlite_3_35"] }
 dotenvy = "0.15"
-libsqlite3-sys = { version = "0.28.0", features = ["bundled"] }
+libsqlite3-sys = { workspace = true, features = ["bundled"] }
 
 [dev-dependencies]
 assert_cmd = "2.0.14"

diff --git a/examples/sqlite/getting_started_step_3/Cargo.toml b/examples/sqlite/getting_started_step_3/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies]
 diesel = { version = "2.1.0", path = "../../../diesel", features = ["sqlite", "returning_clauses_for_sqlite_3_35"] }
 dotenvy = "0.15"
-libsqlite3-sys = { version = "0.28.0", features = ["bundled"] }
+libsqlite3-sys = { workspace = true, features = ["bundled"] }
 
 [dev-dependencies]
 assert_cmd = "2.0.14"

diff --git a/examples/sqlite/relations/Cargo.toml b/examples/sqlite/relations/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 
 [dependencies]
 diesel = { version = "2.1.0", features = ["sqlite", "returning_clauses_for_sqlite_3_35"], path = "../../../diesel" }
-libsqlite3-sys = { version = "0.28.0", features = ["bundled"] }
+libsqlite3-sys = { workspace = true, features = ["bundled"] }
 dotenvy = "0.15.6"
 
 [[bin]]