From 10c495986a46f20c1eed8200f69bdd5d66251f74 Mon Sep 17 00:00:00 2001 From: DK Liao Date: Mon, 2 Oct 2023 18:46:44 +0800 Subject: [PATCH 1/2] publish new versions --- .changes/gtk018.md | 8 --- CHANGELOG.md | 6 ++ Cargo.toml | 7 +- sys/CHANGELOG.md | 6 ++ sys/Cargo.toml | 170 ++++++++++++++++++++++----------------------- 5 files changed, 99 insertions(+), 98 deletions(-) delete mode 100644 .changes/gtk018.md diff --git a/.changes/gtk018.md b/.changes/gtk018.md deleted file mode 100644 index 00452a1..0000000 --- a/.changes/gtk018.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -"webkit2gtk-sys": major -"webkit2gtk-rs": major ---- - -Update gtk to 0.18. - -Bump MSRV to 1.70.0. \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c71ee4..e7f7b6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0] + +- [`b31ff8c`](https://github.com/tauri-apps/javascriptcore-rs/commit/b31ff8cc1438ef1f708b9694caa026d72620cba3) Update gtk to 0.18. + + Bump MSRV to 1.70.0. + ## \[1.1.1] - [`e95f84a`](https://github.com/tauri-apps/javascriptcore-rs/commit/e95f84a72bc7e6fc367929fd04f5aa795a5d00df) Lock webkit2gtk version to 1.0. diff --git a/Cargo.toml b/Cargo.toml index 8d49294..bdacbe2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "webkit2gtk" -version = "1.1.1" +version = "2.0.0" edition = "2021" categories = [ "api-bindings", "gui" ] description = "Rust bindings for webkit-gtk library" @@ -17,10 +17,7 @@ rustdoc-args = [ "--cfg", "docsrs" ] name = "webkit2gtk" [features] -dox = [ - "ffi/dox", - "java_script_core/dox" -] +dox = [ "ffi/dox", "java_script_core/dox" ] v2_2 = [ ] v2_4 = [ "v2_2" ] v2_6 = [ "v2_4", "ffi/v2_6" ] diff --git a/sys/CHANGELOG.md b/sys/CHANGELOG.md index b7c5b5f..bfb3f1b 100644 --- a/sys/CHANGELOG.md +++ b/sys/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0] + +- [`b31ff8c`](https://github.com/tauri-apps/javascriptcore-rs/commit/b31ff8cc1438ef1f708b9694caa026d72620cba3) Update gtk to 0.18. + + Bump MSRV to 1.70.0. + ## \[1.1.1] - [`e95f84a`](https://github.com/tauri-apps/javascriptcore-rs/commit/e95f84a72bc7e6fc367929fd04f5aa795a5d00df) Lock webkit2gtk version to 1.0. diff --git a/sys/Cargo.toml b/sys/Cargo.toml index c0f2774..14c9c41 100644 --- a/sys/Cargo.toml +++ b/sys/Cargo.toml @@ -1,77 +1,77 @@ [package] name = "webkit2gtk-sys" build = "build.rs" -categories = ["api-bindings", "gui"] +categories = [ "api-bindings", "gui" ] description = "Rust binding for webkit-gtk library" -keywords = ["webkit", "gtk-rs", "gnome", "GUI"] +keywords = [ "webkit", "gtk-rs", "gnome", "GUI" ] license = "MIT" links = "web_kit2" repository = "https://github.com/tauri-apps/webkit2gtk-rs" -version = "1.1.1" +version = "2.0.0" edition = "2018" [package.metadata.docs.rs] -features = ["dox"] -rustc-args = ["--cfg", "docsrs"] -rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"] +features = [ "dox" ] +rustc-args = [ "--cfg", "docsrs" ] +rustdoc-args = [ "--cfg", "docsrs", "--generate-link-to-definition" ] [package.metadata.system-deps.webkit2gtk_4_1] name = "webkit2gtk-4.1" version = "2.4" -[package.metadata.system-deps.webkit2gtk_4_1.v2_6] -version = "2.6" + [package.metadata.system-deps.webkit2gtk_4_1.v2_6] + version = "2.6" -[package.metadata.system-deps.webkit2gtk_4_1.v2_8] -version = "2.8" + [package.metadata.system-deps.webkit2gtk_4_1.v2_8] + version = "2.8" -[package.metadata.system-deps.webkit2gtk_4_1.v2_10] -version = "2.10" + [package.metadata.system-deps.webkit2gtk_4_1.v2_10] + version = "2.10" -[package.metadata.system-deps.webkit2gtk_4_1.v2_12] -version = "2.12" + [package.metadata.system-deps.webkit2gtk_4_1.v2_12] + version = "2.12" -[package.metadata.system-deps.webkit2gtk_4_1.v2_14] -version = "2.14" + [package.metadata.system-deps.webkit2gtk_4_1.v2_14] + version = "2.14" -[package.metadata.system-deps.webkit2gtk_4_1.v2_16] -version = "2.16" + [package.metadata.system-deps.webkit2gtk_4_1.v2_16] + version = "2.16" -[package.metadata.system-deps.webkit2gtk_4_1.v2_18] -version = "2.18" + [package.metadata.system-deps.webkit2gtk_4_1.v2_18] + version = "2.18" -[package.metadata.system-deps.webkit2gtk_4_1.v2_20] -version = "2.20" + [package.metadata.system-deps.webkit2gtk_4_1.v2_20] + version = "2.20" -[package.metadata.system-deps.webkit2gtk_4_1.v2_22] -version = "2.22" + [package.metadata.system-deps.webkit2gtk_4_1.v2_22] + version = "2.22" -[package.metadata.system-deps.webkit2gtk_4_1.v2_24] -version = "2.24" + [package.metadata.system-deps.webkit2gtk_4_1.v2_24] + version = "2.24" -[package.metadata.system-deps.webkit2gtk_4_1.v2_26] -version = "2.26" + [package.metadata.system-deps.webkit2gtk_4_1.v2_26] + version = "2.26" -[package.metadata.system-deps.webkit2gtk_4_1.v2_28] -version = "2.28" + [package.metadata.system-deps.webkit2gtk_4_1.v2_28] + version = "2.28" -[package.metadata.system-deps.webkit2gtk_4_1.v2_30] -version = "2.30" + [package.metadata.system-deps.webkit2gtk_4_1.v2_30] + version = "2.30" -[package.metadata.system-deps.webkit2gtk_4_1.v2_32] -version = "2.32" + [package.metadata.system-deps.webkit2gtk_4_1.v2_32] + version = "2.32" -[package.metadata.system-deps.webkit2gtk_4_1.v2_34] -version = "2.34" + [package.metadata.system-deps.webkit2gtk_4_1.v2_34] + version = "2.34" -[package.metadata.system-deps.webkit2gtk_4_1.v2_36] -version = "2.36" + [package.metadata.system-deps.webkit2gtk_4_1.v2_36] + version = "2.36" -[package.metadata.system-deps.webkit2gtk_4_1.v2_38] -version = "2.38" + [package.metadata.system-deps.webkit2gtk_4_1.v2_38] + version = "2.38" -[package.metadata.system-deps.webkit2gtk_4_1.v2_40] -version = "2.40" + [package.metadata.system-deps.webkit2gtk_4_1.v2_40] + version = "2.40" [lib] name = "webkit2gtk_sys" @@ -84,59 +84,59 @@ system-deps = "6" bitflags = "^1.0" libc = "0.2" -[dependencies.gtk] -package = "gtk-sys" -version = "0.18" + [dependencies.gtk] + package = "gtk-sys" + version = "0.18" -[dependencies.gdk] -package = "gdk-sys" -version = "0.18" + [dependencies.gdk] + package = "gdk-sys" + version = "0.18" -[dependencies.gio] -package = "gio-sys" -version = "0.18" + [dependencies.gio] + package = "gio-sys" + version = "0.18" -[dependencies.glib] -package = "glib-sys" -version = "0.18" + [dependencies.glib] + package = "glib-sys" + version = "0.18" -[dependencies.gobject] -package = "gobject-sys" -version = "0.18" + [dependencies.gobject] + package = "gobject-sys" + version = "0.18" -[dependencies.cairo] -package = "cairo-sys-rs" -version = "0.18" + [dependencies.cairo] + package = "cairo-sys-rs" + version = "0.18" -[dependencies.java_script_core] -package = "javascriptcore-rs-sys" -version = "=1.1" + [dependencies.java_script_core] + package = "javascriptcore-rs-sys" + version = "=1.1" -[dependencies.soup] -package = "soup3-sys" -version = "0.5" + [dependencies.soup] + package = "soup3-sys" + version = "0.5" [dev-dependencies] shell-words = "1.0.0" tempfile = "3" [features] -dox = ["java_script_core/dox"] -v2_6 = [] -v2_8 = ["v2_6"] -v2_10 = ["v2_8"] -v2_12 = ["v2_10"] -v2_14 = ["v2_12"] -v2_16 = ["v2_14"] -v2_18 = ["v2_16"] -v2_20 = ["v2_18"] -v2_22 = ["v2_20"] -v2_24 = ["v2_22"] -v2_26 = ["v2_24"] -v2_28 = ["v2_26"] -v2_30 = ["v2_28"] -v2_32 = ["v2_30"] -v2_34 = ["v2_32"] -v2_36 = ["v2_34"] -v2_38 = ["v2_36"] -v2_40 = ["v2_38"] +dox = [ "java_script_core/dox" ] +v2_6 = [ ] +v2_8 = [ "v2_6" ] +v2_10 = [ "v2_8" ] +v2_12 = [ "v2_10" ] +v2_14 = [ "v2_12" ] +v2_16 = [ "v2_14" ] +v2_18 = [ "v2_16" ] +v2_20 = [ "v2_18" ] +v2_22 = [ "v2_20" ] +v2_24 = [ "v2_22" ] +v2_26 = [ "v2_24" ] +v2_28 = [ "v2_26" ] +v2_30 = [ "v2_28" ] +v2_32 = [ "v2_30" ] +v2_34 = [ "v2_32" ] +v2_36 = [ "v2_34" ] +v2_38 = [ "v2_36" ] +v2_40 = [ "v2_38" ] From 675f7c63cf56e360eac836dac52d841899d38f07 Mon Sep 17 00:00:00 2001 From: DK Liao Date: Mon, 2 Oct 2023 18:47:58 +0800 Subject: [PATCH 2/2] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index bdacbe2..e851d8d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,4 +65,4 @@ gtk-sys = "^0.18.0" [dependencies.ffi] package = "webkit2gtk-sys" path = "sys" - version = "=1.1.1" + version = "=2.0.0"