Skip to content

Commit f272002

Browse files
authored
chore: revert ratatui-0.30 changes (#58)
Reverting the main branch back to tracking the release version of Ratatui so that I can release changes to stable widgets and work on the ratatui-0.30 widgets in another branch. https://github.com/joshka/tui-widgets/tree/ratatui-0.30
1 parent 920a0f3 commit f272002

File tree

13 files changed

+19
-24
lines changed

13 files changed

+19
-24
lines changed

Cargo.toml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@ derive-getters = "0.5.0"
2121
derive_setters = "0.1.6"
2222
document-features = "0.2.10"
2323
futures = "0.3.31"
24-
itertools = "0.13.0"
24+
itertools = "0.14.0"
2525
indoc = "2.0.5"
2626
lipsum = "0.9.1"
2727
pretty_assertions = "1.4.1"
28-
ratatui = { version = "0.30.0-alpha.0", default-features = false }
29-
ratatui-core = { version = "0.1.0-alpha.0" }
30-
ratatui-macros = "0.7.0-alpha.0"
31-
ratatui-widgets = { version = "0.3.0-alpha.0" }
32-
rstest = "0.23.0"
28+
ratatui = { version = "0.29.0", default-features = false }
29+
ratatui-macros = "0.6.0"
30+
rstest = "0.24.0"
3331
strum = { version = "0.26.3", features = ["derive"] }
3432
tokio = { version = "1.41.0" }
3533

tui-big-text/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ rust-version.workspace = true
1616
derive_builder.workspace = true
1717
font8x8 = "0.3.1"
1818
itertools.workspace = true
19-
ratatui-core.workspace = true
19+
ratatui = { workspace = true, features = ["crossterm"] }
2020

2121
[dev-dependencies]
2222
color-eyre.workspace = true
2323
crossterm = { workspace = true, features = ["event-stream"] }
2424
futures.workspace = true
2525
indoc.workspace = true
26-
ratatui = { workspace = true, features = ["crossterm"] }
2726
strum.workspace = true
2827
tokio = { workspace = true, features = ["full"] }

tui-big-text/src/big_text.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::cmp::min;
22

33
use derive_builder::Builder;
44
use font8x8::UnicodeFonts;
5-
use ratatui_core::{
5+
use ratatui::{
66
buffer::Buffer,
77
layout::{Alignment, Rect},
88
style::Style,
@@ -206,7 +206,7 @@ fn render_glyph(glyph: [u8; 8], area: Rect, buf: &mut Buffer, pixel_size: &Pixel
206206

207207
#[cfg(test)]
208208
mod tests {
209-
use ratatui_core::style::Stylize;
209+
use ratatui::style::Stylize;
210210

211211
use super::*;
212212

tui-box-text/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ keywords.workspace = true
1313
[dependencies]
1414
color-eyre.workspace = true
1515
indoc.workspace = true
16-
ratatui-core.workspace = true
16+
ratatui = { workspace = true, default-features = true }
1717

1818
[dev-dependencies]
1919
ratatui = { workspace = true, default-features = true }

tui-box-text/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::{collections::HashMap, iter::zip, sync::LazyLock};
22

3-
use ratatui_core::{buffer::Buffer, layout::Rect, widgets::Widget};
3+
use ratatui::{buffer::Buffer, layout::Rect, widgets::Widget};
44

55
pub struct BoxChar(char);
66

tui-cards/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ keywords.workspace = true
1717
color-eyre.workspace = true
1818
indoc.workspace = true
1919
strum.workspace = true
20-
ratatui-core.workspace = true
2120
itertools.workspace = true
21+
ratatui = { workspace = true }
2222

2323
[dev-dependencies]
2424
ratatui = { workspace = true, default-features = true }

tui-cards/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use std::iter::zip;
2222

2323
use indoc::indoc;
24-
use ratatui_core::{
24+
use ratatui::{
2525
buffer::Buffer,
2626
layout::Rect,
2727
style::{Color, Stylize},

tui-popup/examples/paragraph.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl App {
4949
let lines: Text = (0..10).map(|i| Span::raw(format!("Line {i}"))).collect();
5050
let paragraph = Paragraph::new(lines).scroll((self.scroll, 0));
5151
let wrapper = KnownSizeWrapper {
52-
inner: &paragraph,
52+
inner: paragraph,
5353
width: 21,
5454
height: 5,
5555
};

tui-popup/examples/state.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fn render_popup(frame: &mut Frame, area: Rect, state: &mut PopupState) {
5252
"h: move left",
5353
"l: move right",
5454
]);
55-
let popup = Popup::new(&body)
55+
let popup = Popup::new(body)
5656
.title("Popup")
5757
.style(Style::new().white().on_blue());
5858
frame.render_stateful_widget(popup, area, state);

tui-scrollview/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ rust-version.workspace = true
1313

1414
[dependencies]
1515
indoc.workspace = true
16-
ratatui-core.workspace = true
17-
ratatui-widgets.workspace = true
16+
ratatui = { workspace = true }
1817

1918
[dev-dependencies]
2019
color-eyre.workspace = true

0 commit comments

Comments
 (0)