From a79d98f2472b973bbfd1cf9cc0d0afd125bc7839 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 3 Feb 2024 11:48:15 -0300
Subject: [PATCH] Publish New Versions (#869)

Co-authored-by: pewsheen <pewsheen@users.noreply.github.com>
---
 .changes/child-styles.md                    |  5 ---
 .changes/transient-for-relax-constraints.md |  5 ---
 CHANGELOG.md                                |  5 +++
 Cargo.toml                                  | 44 ++++++++++-----------
 4 files changed, 27 insertions(+), 32 deletions(-)
 delete mode 100644 .changes/child-styles.md
 delete mode 100644 .changes/transient-for-relax-constraints.md

diff --git a/.changes/child-styles.md b/.changes/child-styles.md
deleted file mode 100644
index a7972ea96..000000000
--- a/.changes/child-styles.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"tao": "patch"
----
-
-On Windows, Remove `WS_CAPTION` and `WS_EX_WINDOWEDGE` window styles when creating a child window.
diff --git a/.changes/transient-for-relax-constraints.md b/.changes/transient-for-relax-constraints.md
deleted file mode 100644
index 4ffdfa697..000000000
--- a/.changes/transient-for-relax-constraints.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"tao": "minor"
----
-
-**Breaking Change**: Changed `WindowBuilderExtUnix::with_transient_for` signature to take `&impl gtk::glib::IsA<gtk::Window>` instead of `gtk::ApplicationWindow` which covers more gtk window types and matches the underlying API call signature.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb65248b6..50c25d103 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## \[0.25.0]
+
+- [`ae4b693d`](https://github.com/tauri-apps/tao/commit/ae4b693dc0a5d4f556bb9e6dcdbbeb1cfbf8f862)([#864](https://github.com/tauri-apps/tao/pull/864)) On Windows, Remove `WS_CAPTION` and `WS_EX_WINDOWEDGE` window styles when creating a child window.
+- [`e10f6a68`](https://github.com/tauri-apps/tao/commit/e10f6a68287553c4bb8a62b71ee62dd543918681)([#862](https://github.com/tauri-apps/tao/pull/862)) **Breaking Change**: Changed `WindowBuilderExtUnix::with_transient_for` signature to take `&impl gtk::glib::IsA<gtk::Window>` instead of `gtk::ApplicationWindow` which covers more gtk window types and matches the underlying API call signature.
+
 ## \[0.24.1]
 
 - [`25a8836b`](https://github.com/tauri-apps/tao/commit/25a8836b6493d1873d7c263bb5603c2a4e3364a1)([#860](https://github.com/tauri-apps/tao/pull/860)) Fix the app crash on restart due to Android context was not released. Release the Android context when the app is destroyed to avoid assertion failure.
diff --git a/Cargo.toml b/Cargo.toml
index b4e4609a7..64ff9bf56 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tao"
-version = "0.24.1"
+version = "0.25.0"
 description = "Cross-platform window manager library."
 authors = [
   "Tauri Programme within The Commons Conservancy",
@@ -55,27 +55,6 @@ env_logger = "0.10"
 [target."cfg(target_os = \"windows\")".dev-dependencies]
 softbuffer = "0.4.1"
 
-[target."cfg(any(target_os = \"android\", target_os = \"windows\"))".dependencies]
-once_cell = "1"
-
-[target."cfg(target_os = \"android\")".dependencies]
-jni = "0.21"
-ndk = "0.7"
-ndk-sys = "0.4"
-ndk-context = "0.1"
-tao-macros = { version = "0.1.0", path = "./tao-macros" }
-
-[target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies]
-objc = "0.2"
-
-[target."cfg(target_os = \"macos\")".dependencies]
-cocoa = "0.25"
-core-foundation = "0.9"
-core-graphics = "0.23"
-dispatch = "0.2"
-scopeguard = "1.2"
-png = "0.17"
-
 [target."cfg(target_os = \"windows\")".dependencies]
 parking_lot = "0.12"
 unicode-segmentation = "1.10"
@@ -115,6 +94,27 @@ windows-version = "0.1"
   "Win32_UI_WindowsAndMessaging"
 ]
 
+[target."cfg(any(target_os = \"android\", target_os = \"windows\"))".dependencies]
+once_cell = "1"
+
+[target."cfg(target_os = \"android\")".dependencies]
+jni = "0.21"
+ndk = "0.7"
+ndk-sys = "0.4"
+ndk-context = "0.1"
+tao-macros = { version = "0.1.0", path = "./tao-macros" }
+
+[target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies]
+objc = "0.2"
+
+[target."cfg(target_os = \"macos\")".dependencies]
+cocoa = "0.25"
+core-foundation = "0.9"
+core-graphics = "0.23"
+dispatch = "0.2"
+scopeguard = "1.2"
+png = "0.17"
+
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 gtk = "0.18"
 gdkx11-sys = "0.18"