From 244aeae0867102410f8e67695dbce3f0fe91aa9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?= Date: Sun, 10 Dec 2023 14:43:45 +0100 Subject: [PATCH] chore: extract common project properties to workspace This requires bumping MSRV to 1.64. --- .github/workflows/ci.yml | 2 +- CHANGELOG.md | 2 ++ Cargo.toml | 14 ++++++++++++++ README.md | 2 +- packages/aotuv_lancer_vorbis_sys/Cargo.toml | 16 ++++++++-------- packages/ogg_next_sys/Cargo.toml | 14 +++++++------- packages/vorbis_rs/Cargo.toml | 16 ++++++++-------- 7 files changed, 41 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e51e01e..7170230 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: - synchronize env: - MSRV: '1.60.0' + MSRV: '1.64.0' jobs: msrv_check: diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d2f42d..ec7f947 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ and this project adheres to explaining important details about sample block size and encoding performance. - Added a remark to the `VorbisEncoder::encode_audio_block` documentation about the usual numeric range of the input sample values. +- Bumped MSRV to 1.64 due to the new usage of workspace property inheritance + features introduced in that Rust version. ### Fixed diff --git a/Cargo.toml b/Cargo.toml index 2d3455d..d3cbdbf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,20 @@ members = ["packages/*"] resolver = "2" +[workspace.package] +authors = ["Alejandro González "] +license = "BSD-3-Clause" +repository = "https://github.com/ComunidadAylas/vorbis-rs" +edition = "2021" +rust-version = "1.64.0" + +[workspace.dependencies] +aotuv_lancer_vorbis_sys = { version = "0.1.3", path = "packages/aotuv_lancer_vorbis_sys" } +ogg_next_sys = { version = "0.1.2", path = "packages/ogg_next_sys" } + +cc = "1.0.83" +bindgen = "0.69.1" + [profile.release] # Add debug symbols on release mode to allow debugging upstream code. # This does not affect library users diff --git a/README.md b/README.md index 7a9029f..d9505d7 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ The supporting `aotuv_lancer_vorbis_sys` and `ogg_next_sys` packages provide automatically-generated low-level bindings used by `vorbis_rs`. The minimum supported Rust version (MSRV) for every package in this repository -is 1.60. Bumping this version is not considered a breaking change for semantic +is 1.64. Bumping this version is not considered a breaking change for semantic versioning purposes. We will try to do it only when we estimate that such a bump would not cause widespread inconvenience or breakage. diff --git a/packages/aotuv_lancer_vorbis_sys/Cargo.toml b/packages/aotuv_lancer_vorbis_sys/Cargo.toml index 34d4065..7cae9f5 100644 --- a/packages/aotuv_lancer_vorbis_sys/Cargo.toml +++ b/packages/aotuv_lancer_vorbis_sys/Cargo.toml @@ -1,14 +1,14 @@ [package] name = "aotuv_lancer_vorbis_sys" description = "Low-level FFI bindings for libvorbis, vorbisfile, and libvorbisenc C libraries with the aoTuV and Lancer patches" -authors = ["Alejandro González "] -license = "BSD-3-Clause" +authors.workspace = true +license.workspace = true version = "0.1.3" readme = "../../README.md" -repository = "https://github.com/ComunidadAylas/vorbis-rs" -edition = "2021" +repository.workspace = true +edition.workspace = true links = "vorbis" -rust-version = "1.60.0" +rust-version.workspace = true keywords = ["libvorbis", "vorbisfile", "libvorbisenc", "aotuv", "lancer"] categories = ["external-ffi-bindings", "multimedia", "multimedia::audio", "multimedia::encoding"] exclude = [ @@ -18,11 +18,11 @@ exclude = [ ] [dependencies] -ogg_next_sys = { version = "0.1.2", path = "../ogg_next_sys" } +ogg_next_sys.workspace = true [build-dependencies] -cc = "1.0.83" -bindgen = { version = "0.69.1", optional = true } +cc.workspace = true +bindgen = { workspace = true, optional = true } [features] # Requires Clang and slows down the build, but guarantees that the bindings are up to date. diff --git a/packages/ogg_next_sys/Cargo.toml b/packages/ogg_next_sys/Cargo.toml index d50495c..58d084f 100644 --- a/packages/ogg_next_sys/Cargo.toml +++ b/packages/ogg_next_sys/Cargo.toml @@ -1,21 +1,21 @@ [package] name = "ogg_next_sys" description = "Updated low-level FFI bindings for the upstream libogg C library" -authors = ["Alejandro González "] -license = "BSD-3-Clause" +authors.workspace = true +license.workspace = true version = "0.1.2" readme = "../../README.md" -repository = "https://github.com/ComunidadAylas/vorbis-rs" -edition = "2021" +repository.workspace = true +edition.workspace = true links = "ogg" -rust-version = "1.60.0" +rust-version.workspace = true keywords = ["libogg", "xiph"] categories = ["external-ffi-bindings", "multimedia", "multimedia::audio", "multimedia::encoding"] exclude = ["/ogg_vendor/**/.*", "/ogg_vendor/cmake", "/ogg_vendor/doc", "/ogg_vendor/README.md"] [build-dependencies] -cc = "1.0.83" -bindgen = { version = "0.69.1", optional = true } +cc.workspace = true +bindgen = { workspace = true, optional = true } [features] # Requires Clang and slows down the build, but guarantees that the bindings are up to date. diff --git a/packages/vorbis_rs/Cargo.toml b/packages/vorbis_rs/Cargo.toml index ffab550..bf972a7 100644 --- a/packages/vorbis_rs/Cargo.toml +++ b/packages/vorbis_rs/Cargo.toml @@ -1,19 +1,19 @@ [package] name = "vorbis_rs" description = "Ogg Vorbis stream encoding and decoding powered by high-level bindings for best-in-breed C libraries" -authors = ["Alejandro González "] -license = "BSD-3-Clause" -version = "0.5.2" +authors.workspace = true +license.workspace = true +version = "0.5.3" readme = "../../README.md" -repository = "https://github.com/ComunidadAylas/vorbis-rs" -edition = "2021" -rust-version = "1.60.0" +repository.workspace = true +edition.workspace = true +rust-version.workspace = true keywords = ["vorbis", "aotuv", "lancer", "ogg", "xiph"] categories = ["api-bindings", "multimedia", "multimedia::audio", "multimedia::encoding"] [dependencies] -aotuv_lancer_vorbis_sys = { version = "0.1.3", path = "../aotuv_lancer_vorbis_sys" } -ogg_next_sys = { version = "0.1.2", path = "../ogg_next_sys" } +aotuv_lancer_vorbis_sys.workspace = true +ogg_next_sys.workspace = true errno = { version = "0.3.8", default-features = false } tinyvec = { version = "1.6.0", default-features = false, features = ["alloc", "rustc_1_57"] }