Merge remote-tracking branch 'origin/dev' into refactor/ios-cert-sync

tauri-apps · Aug 20, 2024 · a939520 · a939520
2 parents d6e076f + 02f85df
commit a939520
Show file tree

Hide file tree

Showing 26 changed files with 172 additions and 46 deletions.
diff --git a/.changes/pre.json b/.changes/pre.json
@@ -6,12 +6,16 @@
     ".changes/android-dev-open-adb-fix.md",
     ".changes/android-gradle-8-9.md",
     ".changes/android-port-forward-fixes.md",
+    ".changes/append_invoke_initialization_script.md",
     ".changes/asset-resolver-dev-fallback.md",
+    ".changes/avoid-rebuilds.md",
     ".changes/brotli-6.md",
+    ".changes/bundler-object-custom-sign-command.md",
     ".changes/change-default-export-option-debugging.md",
     ".changes/change-pr-10435.md",
     ".changes/change-pr-10498.md",
     ".changes/change-pr-10619.md",
+    ".changes/change-pr-10676.md",
     ".changes/check-android-lib-symbols.md",
     ".changes/cli-add-no-fmt.md",
     ".changes/cli-android-template-androidtv.md",
@@ -21,20 +25,24 @@
     ".changes/cli-signtool-path.md",
     ".changes/core-plugin-namespace.md",
     ".changes/dev-url-localhost-mobile.md",
+    ".changes/enhance-permission-error-message.md",
     ".changes/feat-remove-target-sdk.md",
     ".changes/fix-adb.md",
     ".changes/fix-cli-dev-server-android.md",
     ".changes/fix-cli-panic-bun.md",
     ".changes/fix-colon-in-file-path.md",
     ".changes/fix-conf-parsing-error-filepath.md",
     ".changes/fix-config-override.md",
+    ".changes/fix-export-default-permissions.md",
+    ".changes/fix-ios-build-older-swift.md",
     ".changes/fix-ios-bun-support.md",
     ".changes/fix-ipc-fallback.md",
     ".changes/fix-manifest-migration.md",
     ".changes/fix-missing-codesign-error-macos.md",
     ".changes/fix-tslib-path.md",
     ".changes/fix-usage-without-compression.md",
     ".changes/fix-v1-frontend-migration.md",
+    ".changes/fix-xcodebuild-arch.md",
     ".changes/get-window-async.md",
     ".changes/improve-cli-init.md",
     ".changes/infer-signing-identity.md",

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/tauri-build/CHANGELOG.md b/core/tauri-build/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## \[2.0.0-rc.4]
+
+### Bug Fixes
+
+- [`5c335ae9a`](https://www.github.com/tauri-apps/tauri/commit/5c335ae9ad88e46c2135a557390f6e808c9a6088) ([#10648](https://www.github.com/tauri-apps/tauri/pull/10648) by [@Flakebi](https://www.github.com/tauri-apps/tauri/../../Flakebi)) Prevent build script from rerunning unnecessarily by only writing files when the content changes.
+- [`77844529f`](https://www.github.com/tauri-apps/tauri/commit/77844529f323434919ad6581d54cb2d97500cf4d) ([#10678](https://www.github.com/tauri-apps/tauri/pull/10678) by [@Norbiros](https://www.github.com/tauri-apps/tauri/../../Norbiros)) Correctly export `DefaultPermissionsRule`
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+
 ## \[2.0.0-rc.3]
 
 ### New Features

diff --git a/core/tauri-build/Cargo.toml b/core/tauri-build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-build"
-version = "2.0.0-rc.3"
+version = "2.0.0-rc.4"
 description = "build time code to pair with https://crates.io/crates/tauri"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -28,8 +28,8 @@ rustdoc-args = [ "--cfg", "docsrs" ]
 [dependencies]
 anyhow = "1"
 quote = { version = "1", optional = true }
-tauri-codegen = { version = "2.0.0-rc.3", path = "../tauri-codegen", optional = true }
-tauri-utils = { version = "2.0.0-rc.3", path = "../tauri-utils", features = [ "build", "resources" ] }
+tauri-codegen = { version = "2.0.0-rc.4", path = "../tauri-codegen", optional = true }
+tauri-utils = { version = "2.0.0-rc.4", path = "../tauri-utils", features = [ "build", "resources" ] }
 cargo_toml = "0.17"
 serde = "1"
 serde_json = "1"

diff --git a/core/tauri-codegen/CHANGELOG.md b/core/tauri-codegen/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-rc.4]
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+
 ## \[2.0.0-rc.3]
 
 ### Dependencies

diff --git a/core/tauri-codegen/Cargo.toml b/core/tauri-codegen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-codegen"
-version = "2.0.0-rc.3"
+version = "2.0.0-rc.4"
 description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -20,7 +20,7 @@ quote = "1"
 syn = "2"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
-tauri-utils = { version = "2.0.0-rc.3", path = "../tauri-utils", features = [ "build" ] }
+tauri-utils = { version = "2.0.0-rc.4", path = "../tauri-utils", features = [ "build" ] }
 thiserror = "1"
 walkdir = "2"
 brotli = { version = "6", optional = true, default-features = false, features = [ "std" ] }

diff --git a/core/tauri-macros/CHANGELOG.md b/core/tauri-macros/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-rc.4]
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+
 ## \[2.0.0-rc.3]
 
 ### Dependencies

diff --git a/core/tauri-macros/Cargo.toml b/core/tauri-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-macros"
-version = "2.0.0-rc.3"
+version = "2.0.0-rc.4"
 description = "Macros for the tauri crate."
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -20,8 +20,8 @@ proc-macro2 = { version = "1", features = [ "span-locations" ] }
 quote = "1"
 syn = { version = "2", features = [ "full" ] }
 heck = "0.5"
-tauri-codegen = { version = "2.0.0-rc.3", default-features = false, path = "../tauri-codegen" }
-tauri-utils = { version = "2.0.0-rc.3", path = "../tauri-utils" }
+tauri-codegen = { version = "2.0.0-rc.4", default-features = false, path = "../tauri-codegen" }
+tauri-utils = { version = "2.0.0-rc.4", path = "../tauri-utils" }
 
 [features]
 custom-protocol = [ ]

diff --git a/core/tauri-plugin/CHANGELOG.md b/core/tauri-plugin/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-rc.4]
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+
 ## \[2.0.0-rc.3]
 
 ### Dependencies

diff --git a/core/tauri-plugin/Cargo.toml b/core/tauri-plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin"
-version = "2.0.0-rc.3"
+version = "2.0.0-rc.4"
 description = "Build script and runtime Tauri plugin definitions"
 authors = { workspace = true }
 homepage = { workspace = true }
@@ -30,7 +30,7 @@ runtime = [ ]
 [dependencies]
 anyhow = { version = "1", optional = true }
 serde = { version = "1", optional = true }
-tauri-utils = { version = "2.0.0-rc.3", default-features = false, features = [ "build" ], path = "../tauri-utils" }
+tauri-utils = { version = "2.0.0-rc.4", default-features = false, features = [ "build" ], path = "../tauri-utils" }
 serde_json = { version = "1", optional = true }
 glob = { version = "0.3", optional = true }
 toml = { version = "0.8", optional = true }

diff --git a/core/tauri-runtime-wry/CHANGELOG.md b/core/tauri-runtime-wry/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-rc.4]
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+
 ## \[2.0.0-rc.3]
 
 ### Dependencies

diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-runtime-wry"
-version = "2.0.0-rc.3"
+version = "2.0.0-rc.4"
 description = "Wry bindings to the Tauri runtime"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -19,8 +19,8 @@ rustdoc-args = [ "--cfg", "docsrs" ]
 [dependencies]
 wry = { version = "0.42", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] }
 tao = { version = "0.29", default-features = false, features = [ "rwh_06" ] }
-tauri-runtime = { version = "2.0.0-rc.3", path = "../tauri-runtime" }
-tauri-utils = { version = "2.0.0-rc.3", path = "../tauri-utils" }
+tauri-runtime = { version = "2.0.0-rc.4", path = "../tauri-runtime" }
+tauri-utils = { version = "2.0.0-rc.4", path = "../tauri-utils" }
 raw-window-handle = "0.6"
 http = "1.1"
 url = "2"

diff --git a/core/tauri-runtime/CHANGELOG.md b/core/tauri-runtime/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-rc.4]
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+
 ## \[2.0.0-rc.3]
 
 ### Dependencies

diff --git a/core/tauri-runtime/Cargo.toml b/core/tauri-runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-runtime"
-version = "2.0.0-rc.3"
+version = "2.0.0-rc.4"
 description = "Runtime for Tauri applications"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -29,7 +29,7 @@ targets = [
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 thiserror = "1.0"
-tauri-utils = { version = "2.0.0-rc.3", path = "../tauri-utils" }
+tauri-utils = { version = "2.0.0-rc.4", path = "../tauri-utils" }
 http = "1.1"
 raw-window-handle = "0.6"
 url = { version = "2" }

diff --git a/core/tauri-utils/CHANGELOG.md b/core/tauri-utils/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## \[2.0.0-rc.4]
+
+### New Features
+
+- [`8d148a9e2`](https://www.github.com/tauri-apps/tauri/commit/8d148a9e2566edebfea2d75f32df7c9396d765a4) ([#10634](https://www.github.com/tauri-apps/tauri/pull/10634) by [@anatawa12](https://www.github.com/tauri-apps/tauri/../../anatawa12)) Custom sign command with object notation for whitespaces in the command path and arguments.
+
+### Bug Fixes
+
+- [`5c335ae9a`](https://www.github.com/tauri-apps/tauri/commit/5c335ae9ad88e46c2135a557390f6e808c9a6088) ([#10648](https://www.github.com/tauri-apps/tauri/pull/10648) by [@Flakebi](https://www.github.com/tauri-apps/tauri/../../Flakebi)) Prevent build script from rerunning unnecessarily by only writing files when the content changes.
+
 ## \[2.0.0-rc.3]
 
 ### Enhancements

diff --git a/core/tauri-utils/Cargo.toml b/core/tauri-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-utils"
-version = "2.0.0-rc.3"
+version = "2.0.0-rc.4"
 description = "Utilities for Tauri"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"

diff --git a/core/tauri/CHANGELOG.md b/core/tauri/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## \[2.0.0-rc.4]
+
+### Enhancements
+
+- [`30c7685eb`](https://www.github.com/tauri-apps/tauri/commit/30c7685eb82c7a1a9af53abdca7d75b1a886cc6e) ([#10295](https://www.github.com/tauri-apps/tauri/pull/10295) by [@liesauer](https://www.github.com/tauri-apps/tauri/../../liesauer)) Added `Builder::append_invoke_initialization_script`.
+- [`ed04cc3d3`](https://www.github.com/tauri-apps/tauri/commit/ed04cc3d36205b277517d052dfd997b6c3cb673d) ([#10664](https://www.github.com/tauri-apps/tauri/pull/10664) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Include more information in the IPC permission error message.
+
+### Bug Fixes
+
+- [`5c335ae9a`](https://www.github.com/tauri-apps/tauri/commit/5c335ae9ad88e46c2135a557390f6e808c9a6088) ([#10648](https://www.github.com/tauri-apps/tauri/pull/10648) by [@Flakebi](https://www.github.com/tauri-apps/tauri/../../Flakebi)) Prevent build script from rerunning unnecessarily by only writing files when the content changes.
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+
 ## \[2.0.0-rc.3]
 
 ### Bug Fixes

diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri"
-version = "2.0.0-rc.3"
+version = "2.0.0-rc.4"
 description = "Make tiny, secure apps for all desktop platforms with Tauri"
 exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -51,10 +51,10 @@ uuid = { version = "1", features = [ "v4" ], optional = true }
 url = "2"
 anyhow = "1.0"
 thiserror = "1.0"
-tauri-runtime = { version = "2.0.0-rc.3", path = "../tauri-runtime" }
-tauri-macros = { version = "2.0.0-rc.3", path = "../tauri-macros" }
-tauri-utils = { version = "2.0.0-rc.3", features = [ "resources" ], path = "../tauri-utils" }
-tauri-runtime-wry = { version = "2.0.0-rc.3", path = "../tauri-runtime-wry", optional = true }
+tauri-runtime = { version = "2.0.0-rc.4", path = "../tauri-runtime" }
+tauri-macros = { version = "2.0.0-rc.4", path = "../tauri-macros" }
+tauri-utils = { version = "2.0.0-rc.4", features = [ "resources" ], path = "../tauri-utils" }
+tauri-runtime-wry = { version = "2.0.0-rc.4", path = "../tauri-runtime-wry", optional = true }
 getrandom = "0.2"
 serde_repr = "0.1"
 state = "0.6"
@@ -110,8 +110,8 @@ swift-rs = "1.0.6"
 
 [build-dependencies]
 heck = "0.5"
-tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-rc.3" }
-tauri-utils = { path = "../tauri-utils/", version = "2.0.0-rc.3", features = [ "build" ] }
+tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-rc.4" }
+tauri-utils = { path = "../tauri-utils/", version = "2.0.0-rc.4", features = [ "build" ] }
 
 [dev-dependencies]
 proptest = "1.4.0"