Skip to content

Commit

Permalink
build(ribir): 🤖 addressed issue with failed release
Browse files Browse the repository at this point in the history
  • Loading branch information
M-Adoo committed Dec 2, 2024
1 parent 8609f1b commit 1518e84
Show file tree
Hide file tree
Showing 22 changed files with 40 additions and 41 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ homepage = "https://ribir.org"
keywords = ["gui", "ui", "declarative", "compose-ui"]
license = "MIT"
readme = "README.md"
version = "0.4.0-alpha.15"
version = "0.4.0-alpha.16"
rust-version = "1.81.0"

[workspace.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cli"
version = "0.4.0-alpha.15"
version = "0.4.0-alpha.16"
edition = "2021"
publish = false

Expand Down
8 changes: 4 additions & 4 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ lyon_geom.workspace = true
paste.workspace = true
triomphe.workspace = true
pin-project-lite.workspace = true
ribir_algo = {path = "../algo", version = "0.4.0-alpha.15" }
ribir_geom = {path = "../geom", version = "0.4.0-alpha.15" }
ribir_macros = {path = "../macros", version = "0.4.0-alpha.15" }
ribir_painter = {path = "../painter", version = "0.4.0-alpha.15" }
ribir_algo = {path = "../algo", version = "0.4.0-alpha.16" }
ribir_geom = {path = "../geom", version = "0.4.0-alpha.16" }
ribir_macros = {path = "../macros", version = "0.4.0-alpha.16" }
ribir_painter = {path = "../painter", version = "0.4.0-alpha.16" }
rxrust.workspace = true
smallvec.workspace = true
winit.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions dev-helper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ version.workspace = true

[dependencies]
futures.workspace = true
ribir_geom = {path = "../geom", version = "0.4.0-alpha.15" }
ribir_gpu = {path = "../gpu", version = "0.4.0-alpha.15" }
ribir_painter = {path = "../painter", features = ["png"], version = "0.4.0-alpha.15" }
ribir_geom = {path = "../geom", version = "0.4.0-alpha.16" }
ribir_gpu = {path = "../gpu", version = "0.4.0-alpha.16" }
ribir_painter = {path = "../painter", features = ["png"], version = "0.4.0-alpha.16" }
image.workspace = true
dssim-core.workspace = true

Expand Down
3 changes: 2 additions & 1 deletion examples/counter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ version.workspace = true
[dependencies]
paste.workspace = true
# we disable `default-features`, because we want more control over testing.
ribir = {path = "../../ribir", features = ["material", "slim", "widgets"]}
ribir = {path = "../../ribir", features = ["material", "widgets"]}

[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1.6"
wasm-bindgen = "0.2.92"

[dev-dependencies]
ribir_slim = { path = "../../themes/ribir_slim" }
ribir_dev_helper = {path = "../../dev-helper"}

[features]
Expand Down
2 changes: 1 addition & 1 deletion examples/counter/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub fn run() {

#[cfg(test)]
mod tests {
use ribir::{core::test_helper::*, material as ribir_material, slim as ribir_slim};
use ribir::{core::test_helper::*, material as ribir_material};
use ribir_dev_helper::*;

use super::*;
Expand Down
3 changes: 2 additions & 1 deletion examples/messages/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ version.workspace = true
[dependencies]
paste.workspace = true
# we disable `default-features`, because we want more control over testing.
ribir = {path = "../../ribir", features = ["material", "slim", "widgets"]}
ribir = {path = "../../ribir", features = ["material", "widgets"]}
ribir_slim = { path = "../../themes/ribir_slim" }

[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1.6"
Expand Down
2 changes: 1 addition & 1 deletion examples/messages/src/messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl Compose for MessageList {

#[cfg(test)]
mod tests {
use ribir::{core::test_helper::*, material as ribir_material, slim as ribir_slim};
use ribir::{core::test_helper::*, material as ribir_material};
use ribir_dev_helper::*;

use super::*;
Expand Down
1 change: 1 addition & 0 deletions examples/storybook/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ribir = {path = "../../ribir", features = ["material", "widgets"]}

[dev-dependencies]
ribir_dev_helper = {path = "../../dev-helper"}
ribir_slim = { path = "../../themes/ribir_slim" }

[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1.6"
Expand Down
2 changes: 1 addition & 1 deletion examples/storybook/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub fn run() {

#[cfg(test)]
mod tests {
use ribir::{core::test_helper::*, material as ribir_material, slim as ribir_slim};
use ribir::{core::test_helper::*, material as ribir_material};
use ribir_dev_helper::*;

use super::*;
Expand Down
3 changes: 2 additions & 1 deletion examples/todos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ version.workspace = true
[dependencies]
paste.workspace = true
# we disable `default-features`, because we want more control over testing.
ribir = {path = "../../ribir", features = ["material", "slim", "widgets"]}
ribir = {path = "../../ribir", features = ["material", "widgets"]}
serde = {workspace = true, features = ["derive"]}
serde_json = {workspace = true}

Expand All @@ -24,6 +24,7 @@ wasm-bindgen = "0.2.92"


[dev-dependencies]
ribir_slim = { path = "../../themes/ribir_slim" }
ribir_dev_helper = {path = "../../dev-helper"}

[features]
Expand Down
2 changes: 1 addition & 1 deletion examples/todos/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub fn run() {

#[cfg(test)]
mod tests {
use ribir::{core::test_helper::*, material as ribir_material, slim as ribir_slim};
use ribir::{core::test_helper::*, material as ribir_material};
use ribir_dev_helper::*;

use super::*;
Expand Down
3 changes: 2 additions & 1 deletion examples/wordle_game/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ version.workspace = true

[dependencies]
paste.workspace = true
ribir = {path = "../../ribir", features = ["material", "slim", "widgets"]}
ribir = {path = "../../ribir", features = ["material", "widgets"]}
csv = "1.3.0"
rand = "0.8.5"
getrandom = { workspace = true }
Expand All @@ -25,6 +25,7 @@ wasm-bindgen = "0.2.92"

[dev-dependencies]
ribir_dev_helper = {path = "../../dev-helper"}
ribir_slim = { path = "../../themes/ribir_slim" }

[features]
wgpu = ["ribir/wgpu"]
Expand Down
2 changes: 1 addition & 1 deletion examples/wordle_game/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub fn run() {

#[cfg(test)]
mod tests {
use ribir::{core::test_helper::*, material as ribir_material, slim as ribir_slim};
use ribir::{core::test_helper::*, material as ribir_material};
use ribir_dev_helper::*;

use super::*;
Expand Down
6 changes: 3 additions & 3 deletions gpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ futures = {workspace = true, optional = true}
guillotiere.workspace = true
log.workspace = true
rayon.workspace = true
ribir_algo = {path = "../algo", version = "0.4.0-alpha.15" }
ribir_geom = {path = "../geom", version = "0.4.0-alpha.15" }
ribir_painter = {path = "../painter", features = ["tessellation"], version = "0.4.0-alpha.15" }
ribir_algo = {path = "../algo", version = "0.4.0-alpha.16" }
ribir_geom = {path = "../geom", version = "0.4.0-alpha.16" }
ribir_painter = {path = "../painter", features = ["tessellation"], version = "0.4.0-alpha.16" }
slab = "0.4.9"
wgpu = {workspace = true, optional = true}
zerocopy = {workspace=true, features = ["derive"]}
Expand Down
2 changes: 1 addition & 1 deletion macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ahash.workspace = true
bitflags.workspace = true
proc-macro2.workspace = true
quote.workspace = true
ribir_painter = {path = "../painter", version = "0.4.0-alpha.15" }
ribir_painter = {path = "../painter", version = "0.4.0-alpha.16" }
smallvec = { workspace = true, features= ["drain_filter"] }
syn = { workspace = true, features = ["fold", "full", "extra-traits"]}
phf = { workspace = true, features = ["macros"] }
Expand Down
4 changes: 2 additions & 2 deletions painter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ log.workspace = true
lyon_algorithms = {version = "1.0.3", features = ["serialization"]}
lyon_tessellation = {version = "1.0.3", features = ["serialization"], optional = true}
material-color-utilities-rs = {workspace = true}
ribir_algo = {path = "../algo", version = "0.4.0-alpha.15" }
ribir_geom = {path = "../geom", version = "0.4.0-alpha.15" }
ribir_algo = {path = "../algo", version = "0.4.0-alpha.16" }
ribir_geom = {path = "../geom", version = "0.4.0-alpha.16" }
serde = {version = "1.0", features = ["derive"]}
serde_json.workspace = true
usvg.workspace = true
Expand Down
12 changes: 5 additions & 7 deletions ribir/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ repository = "https://github.com/RibirX/Ribir/ribir"
version.workspace = true

[dependencies]
ribir_algo = { path = "../algo", version = "0.4.0-alpha.15" }
ribir_core = { path = "../core", version = "0.4.0-alpha.15" }
ribir_gpu = { path = "../gpu", version = "0.4.0-alpha.15" }
ribir_material = { path = "../themes/material", version = "0.4.0-alpha.15", optional = true }
ribir_slim = { path = "../themes/ribir_slim", version = "0.4.0-alpha.15", optional = true }
ribir_widgets = { path = "../widgets", version = "0.4.0-alpha.15", optional = true }
ribir_algo = { path = "../algo", version = "0.4.0-alpha.16" }
ribir_core = { path = "../core", version = "0.4.0-alpha.16" }
ribir_gpu = { path = "../gpu", version = "0.4.0-alpha.16" }
ribir_material = { path = "../themes/material", version = "0.4.0-alpha.16", optional = true }
ribir_widgets = { path = "../widgets", version = "0.4.0-alpha.16", optional = true }
rxrust.workspace = true
wgpu = { workspace = true, optional = true }
winit.workspace = true
Expand Down Expand Up @@ -55,7 +54,6 @@ wgpu = ["ribir_gpu/wgpu", "dep:wgpu"]
widgets = ["ribir_widgets"]
tokio-async = ["ribir_core/tokio-async"]
nightly = ["ribir_core/nightly"]
slim = ["ribir_slim"]

[[test]]
harness = false
Expand Down
4 changes: 0 additions & 4 deletions ribir/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ pub mod clipboard;
mod winit_shell_wnd;
#[cfg(feature = "material")]
pub use ribir_material as material;
#[cfg(feature = "slim")]
pub use ribir_slim as slim;

mod platform;
pub use platform::*;
Expand All @@ -19,8 +17,6 @@ pub mod prelude {

#[cfg(feature = "material")]
pub use super::material;
#[cfg(feature = "slim")]
pub use super::slim;
#[cfg(feature = "widgets")]
pub use super::widgets::prelude::*;
pub use crate::app::*;
Expand Down
4 changes: 2 additions & 2 deletions themes/material/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ repository = "https://github.com/RibirX/Ribir/themes/material"
version.workspace = true

[dependencies]
ribir_core = {path = "../../core", version = "0.4.0-alpha.15" }
ribir_widgets = {path = "../../widgets", version = "0.4.0-alpha.15" }
ribir_core = {path = "../../core", version = "0.4.0-alpha.16" }
ribir_widgets = {path = "../../widgets", version = "0.4.0-alpha.16" }
4 changes: 2 additions & 2 deletions themes/ribir_slim/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ version.workspace = true
publish = false

[dependencies]
ribir_core = {path = "../../core", version = "0.4.0-alpha.15" }
ribir_widgets = {path = "../../widgets", version = "0.4.0-alpha.15" }
ribir_core = {path = "../../core", version = "0.4.0-alpha.16" }
ribir_widgets = {path = "../../widgets", version = "0.4.0-alpha.16" }
4 changes: 2 additions & 2 deletions widgets/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ version.workspace = true
[dependencies]
lyon_algorithms.workspace = true
lyon_path.workspace = true
ribir_core = {path = "../core", version = "0.4.0-alpha.15" }
ribir_geom = {path = "../geom", version = "0.4.0-alpha.15" }
ribir_core = {path = "../core", version = "0.4.0-alpha.16" }
ribir_geom = {path = "../geom", version = "0.4.0-alpha.16" }
webbrowser.workspace = true

[dev-dependencies]
Expand Down

0 comments on commit 1518e84

Please sign in to comment.