Merge branch 'next' into fix/workspace-detection

tauri-apps · Sep 23, 2021 · 32a9451 · 32a9451
2 parents dfb70ab + d8fe9d6
commit 32a9451
Show file tree

Hide file tree

Showing 6 changed files with 321 additions and 3,490 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - dev
+      - next
   workflow_dispatch:
 
 jobs:

diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 
 [dependencies]
 #wry = { version = "0.12", default-features = false, features = [ "file-drop", "protocol" ] }
-wry = { git = "https://github.com/tauri-apps/wry", branch = "next", default-features = false, features = [ "file-drop", "protocol" ] }
+wry = { git = "https://github.com/tauri-apps/wry", rev = "21692d986138570d2edc31f84bddb442a3c84a9c", default-features = false, features = [ "file-drop", "protocol" ] }
 tauri-runtime = { version = "0.2.1", path = "../tauri-runtime" }
 tauri-utils = { version = "1.0.0-beta.3", path = "../tauri-utils" }
 uuid = { version = "0.8.2", features = [ "v4" ] }