Skip to content

Commit

Permalink
Bump version numbers of gtk crates to 0.16
Browse files Browse the repository at this point in the history
  • Loading branch information
@pentamassiv
pentamassiv committed Nov 17, 2022
1 parent 1fe37b5 commit b2e320c
Show file tree
Hide file tree
Showing 21 changed files with 88 additions and 259 deletions.
10 changes: 5 additions & 5 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ version = "0.23.0"
edition = "2018"

[dependencies]
cairo-rs = "^0.15.0"
cairo-rs = "0.16.1"
fragile = "1.0"
glib = "^0.15.0"
glib-sys = "^0.15.0"
gobject-sys = "^0.15.0"
gtk = "^0.15.0"
glib = "0.16.2"
glib-sys = "0.16.0"
gobject-sys = "0.16.0"
gtk = "0.16.1"
libc = "^0.2.54"
log = "^0.4.6"

Expand Down
2 changes: 1 addition & 1 deletion README.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ First, add this to your `Cargo.toml`:

[source,toml]
----
gtk = "^0.15.0"
gtk = "^0.16.0"
relm = "^0.23.0"
relm-derive = "^0.23.0"
----
Expand Down
2 changes: 1 addition & 1 deletion relm-derive/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ features = ["extra-traits", "fold", "full", "visit"]
version = "^1.0"

[dev-dependencies]
gtk = "^0.15.0"
gtk = "0.16.1"
relm = { path = ".." }
trybuild = "1.0.42"
15 changes: 6 additions & 9 deletions relm-examples/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,14 @@ edition = "2018"

[dev-dependencies]
chrono = "0.4"
gdk = "^0.15.0"
glib = "^0.15.0"
gtk = "^0.15.0"
gtk-test = "^0.15.0"
rand = "^0.6.1"

# glade_gladis example
gladis = "^2.0.0"
gdk = "^0.16.0"
glib = "^0.16.0"
gtk = "^0.16.0"
gtk-test = "^0.16.0"
rand = "0.8.5"

[dev-dependencies.gio]
version = "^0.15.0"
version = "^0.16.0"

[dev-dependencies.relm]
path = ".."
Expand Down
8 changes: 4 additions & 4 deletions relm-examples/examples/7gui/1_counter/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ authors = ["Julian Schmidhuber <schmidhuberj2@protonmail.com>"]
edition = "2018"

[dependencies]
glib = "^0.15.0"
gtk = "^0.15.0"
glib = "^0.16.0"
gtk = "^0.16.0"

[dependencies.gio]
features = ["v2_50"]
version = "^0.15.0"
features = ["v2_58"]
version = "^0.16.0"
[dependencies.relm]
path = "../../../.."

Expand Down
8 changes: 4 additions & 4 deletions relm-examples/examples/7gui/2_temperature_converter/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ authors = ["Julian Schmidhuber <schmidhuberj2@protonmail.com>"]
edition = "2018"

[dependencies]
glib = "^0.15.0"
gtk = "^0.15.0"
glib = "^0.16.0"
gtk = "^0.16.0"

[dependencies.gio]
features = ["v2_50"]
version = "^0.15.0"
features = ["v2_58"]
version = "^0.16.0"
[dependencies.relm]
path = "../../../.."

Expand Down
10 changes: 5 additions & 5 deletions relm-examples/examples/7gui/3_flight_booker/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ authors = ["Julian Schmidhuber <schmidhuberj2@protonmail.com>"]
edition = "2018"

[dependencies]
glib = "0.15.0"
gtk = "^0.15.0"
glib = "0.16.0"
gtk = "^0.16.0"
chrono = "0.4.19"
gdk = "^0.15.0"
gdk = "^0.16.0"

[dependencies.gio]
features = ["v2_50"]
version = "^0.15.0"
features = ["v2_58"]
version = "^0.16.0"
[dependencies.relm]
path = "../../../.."

Expand Down
8 changes: 4 additions & 4 deletions relm-examples/examples/7gui/4_progress_bar/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ authors = ["Julian Schmidhuber <schmidhuberj2@protonmail.com>"]
edition = "2018"

[dependencies]
glib = "^0.15.0"
gtk = "^0.15.0"
glib = "^0.16.0"
gtk = "^0.16.0"

[dependencies.gio]
features = ["v2_50"]
version = "^0.15.0"
features = ["v2_58"]
version = "^0.16.0"
[dependencies.relm]
path = "../../../.."

Expand Down
8 changes: 4 additions & 4 deletions relm-examples/examples/7gui/5_crud/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ authors = ["Julian Schmidhuber <schmidhuberj2@protonmail.com>"]
edition = "2018"

[dependencies]
glib = "^0.15.0"
gtk = "^0.15.0"
glib = "^0.16.0"
gtk = "^0.16.0"

[dependencies.gio]
features = ["v2_50"]
version = "^0.15.0"
features = ["v2_58"]
version = "^0.16.0"
[dependencies.relm]
path = "../../../.."

Expand Down
12 changes: 6 additions & 6 deletions relm-examples/examples/7gui/6_circle_drawer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ authors = ["Julian Schmidhuber <schmidhuberj2@protonmail.com>"]
edition = "2018"

[dependencies]
glib = "^0.15.0"
gtk = {version = "^0.15.0", features = ["v3_22"]}
gdk = "^0.15.0"
cairo-rs = "^0.15.0"
glib = "^0.16.0"
gtk = { version = "^0.16.0", features = ["v3_24"] }
gdk = "^0.16.0"
cairo-rs = "^0.16.0"

[dependencies.gio]
features = ["v2_50"]
version = "^0.15.0"
features = ["v2_58"]
version = "^0.16.0"

[dependencies.relm]
path = "../../../.."
Expand Down
10 changes: 5 additions & 5 deletions relm-examples/examples/7gui/7_cells/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ authors = ["Julian Schmidhuber <schmidhuberj2@protonmail.com>"]
edition = "2018"

[dependencies]
glib = "^0.15.0"
gtk = {version = "^0.15.0", features = ["v3_22"]}
gdk = "^0.15.0"
glib = "^0.16.0"
gtk = { version = "^0.16.0", features = ["v3_24"] }
gdk = "^0.16.0"

[dependencies.gio]
features = ["v2_50"]
version = "^0.15.0"
features = ["v2_58"]
version = "^0.16.0"

[dependencies.relm]
path = "../../../.."
Expand Down
8 changes: 4 additions & 4 deletions relm-examples/examples/async/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ version = "0.1.0"
edition = "2018"

[dependencies]
glib = "0.15.0"
gtk = "^0.15.0"
glib = "0.16.0"
gtk = "^0.16.0"

[dependencies.gio]
features = ["v2_50"]
version = "^0.15.0"
features = ["v2_58"]
version = "^0.16.0"

[dependencies.relm]
path = "../../.."
Expand Down
4 changes: 2 additions & 2 deletions relm-examples/examples/buttons-attribute/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ authors = ["Antoni Boucher <bouanto@zoho.com>"]
edition = "2018"

[dependencies]
gtk = "^0.15.0"
gtk-test = "^0.15.0"
gtk = "^0.16.0"
gtk-test = "^0.16.0"

[dependencies.relm]
path = "../../.."
Expand Down
16 changes: 8 additions & 8 deletions relm-examples/examples/drawing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@ impl Circle {
fn generate() -> Self {
let mut gen = rand::thread_rng();
Circle {
x: gen.gen_range(20.0, 500.0),
y: gen.gen_range(20.0, 500.0),
x: gen.gen_range(20.0..500.0),
y: gen.gen_range(20.0..500.0),
color: RGBA::new(
gen.gen_range(0.0, 1.0),
gen.gen_range(0.0, 1.0),
gen.gen_range(0.0, 1.0),
gen.gen_range(0.0..1.0),
gen.gen_range(0.0..1.0),
gen.gen_range(0.0..1.0),
1.0,
),
vx: gen.gen_range(1.0, 5.0),
vy: gen.gen_range(1.0, 5.0),
vx: gen.gen_range(1.0..5.0),
vy: gen.gen_range(1.0..5.0),
}
}
}
Expand Down Expand Up @@ -173,4 +173,4 @@ impl Widget for Win {

fn main() {
Win::run(()).unwrap();
}
}
Loading

0 comments on commit b2e320c

Please sign in to comment.