Skip to content

Commit

Permalink
chore: extract common project properties to workspace
Browse files Browse the repository at this point in the history
This requires bumping MSRV to 1.64.
  • Loading branch information
AlexTMjugador committed Dec 10, 2023
1 parent 0660c01 commit 244aeae
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- synchronize

env:
MSRV: '1.60.0'
MSRV: '1.64.0'

jobs:
msrv_check:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 14 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@
members = ["packages/*"]
resolver = "2"

[workspace.package]
authors = ["Alejandro González <[email protected]>"]
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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
16 changes: 8 additions & 8 deletions packages/aotuv_lancer_vorbis_sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
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 = [
Expand All @@ -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.
Expand Down
14 changes: 7 additions & 7 deletions packages/ogg_next_sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
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.
Expand Down
16 changes: 8 additions & 8 deletions packages/vorbis_rs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
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"] }
Expand Down

0 comments on commit 244aeae

Please sign in to comment.