diff --git a/.changes/dmg-settings.md b/.changes/dmg-settings.md new file mode 100644 index 000000000000..290718cdbfb8 --- /dev/null +++ b/.changes/dmg-settings.md @@ -0,0 +1,5 @@ +--- +"tauri-utils": patch:feat +--- + +Add bundle DMG configuration options. diff --git a/.changes/pre.json b/.changes/pre.json index c9b89db9ce34..e8f2cecd8482 100644 --- a/.changes/pre.json +++ b/.changes/pre.json @@ -85,6 +85,7 @@ ".changes/dev-proxy-response-cache.md", ".changes/dev-proxy.md", ".changes/devicectl.md", + ".changes/dmg-settings.md", ".changes/dnd-position.md", ".changes/downgrade-min-sdk-version.md", ".changes/dynamic-wry-plugin.md", diff --git a/core/tauri-build/CHANGELOG.md b/core/tauri-build/CHANGELOG.md index b956bcc281d1..7665c0a85ec3 100644 --- a/core/tauri-build/CHANGELOG.md +++ b/core/tauri-build/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## \[2.0.0-alpha.13] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-alpha.12` +- Upgraded to `tauri-codegen@2.0.0-alpha.12` + ## \[2.0.0-alpha.12] ### Bug Fixes diff --git a/core/tauri-build/Cargo.toml b/core/tauri-build/Cargo.toml index e595322711c2..8e59ac9a49c6 100644 --- a/core/tauri-build/Cargo.toml +++ b/core/tauri-build/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-build" -version = "2.0.0-alpha.12" +version = "2.0.0-alpha.13" 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-alpha.11", path = "../tauri-codegen", optional = true } -tauri-utils = { version = "2.0.0-alpha.11", path = "../tauri-utils", features = [ "build", "resources" ] } +tauri-codegen = { version = "2.0.0-alpha.12", path = "../tauri-codegen", optional = true } +tauri-utils = { version = "2.0.0-alpha.12", 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 index ce98eb166894..5651befd9e1a 100644 --- a/core/tauri-codegen/CHANGELOG.md +++ b/core/tauri-codegen/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-alpha.12] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-alpha.12` + ## \[2.0.0-alpha.11] ### Dependencies diff --git a/core/tauri-codegen/Cargo.toml b/core/tauri-codegen/Cargo.toml index 0c724cd74a15..f77e22561385 100644 --- a/core/tauri-codegen/Cargo.toml +++ b/core/tauri-codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-codegen" -version = "2.0.0-alpha.11" +version = "2.0.0-alpha.12" description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" @@ -19,7 +19,7 @@ proc-macro2 = "1" quote = "1" serde = { version = "1", features = [ "derive" ] } serde_json = "1" -tauri-utils = { version = "2.0.0-alpha.11", path = "../tauri-utils", features = [ "build" ] } +tauri-utils = { version = "2.0.0-alpha.12", path = "../tauri-utils", features = [ "build" ] } thiserror = "1" walkdir = "2" brotli = { version = "3", optional = true, default-features = false, features = [ "std" ] } diff --git a/core/tauri-macros/CHANGELOG.md b/core/tauri-macros/CHANGELOG.md index e9ce1f2f8d61..de9cd0eb0f19 100644 --- a/core/tauri-macros/CHANGELOG.md +++ b/core/tauri-macros/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## \[2.0.0-alpha.12] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-alpha.12` +- Upgraded to `tauri-codegen@2.0.0-alpha.12` + ## \[2.0.0-alpha.11] ### Dependencies diff --git a/core/tauri-macros/Cargo.toml b/core/tauri-macros/Cargo.toml index f115c4ba4088..bea44962ae27 100644 --- a/core/tauri-macros/Cargo.toml +++ b/core/tauri-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-macros" -version = "2.0.0-alpha.11" +version = "2.0.0-alpha.12" description = "Macros for the tauri crate." exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" @@ -20,8 +20,8 @@ proc-macro2 = "1" quote = "1" syn = { version = "2", features = [ "full" ] } heck = "0.4" -tauri-codegen = { version = "2.0.0-alpha.11", default-features = false, path = "../tauri-codegen" } -tauri-utils = { version = "2.0.0-alpha.11", path = "../tauri-utils" } +tauri-codegen = { version = "2.0.0-alpha.12", default-features = false, path = "../tauri-codegen" } +tauri-utils = { version = "2.0.0-alpha.12", path = "../tauri-utils" } [features] custom-protocol = [ ] diff --git a/core/tauri-runtime-wry/CHANGELOG.md b/core/tauri-runtime-wry/CHANGELOG.md index f38d9dd58b9b..f0ecc1efd367 100644 --- a/core/tauri-runtime-wry/CHANGELOG.md +++ b/core/tauri-runtime-wry/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## \[1.0.0-alpha.8] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-alpha.12` +- Upgraded to `tauri-runtime@1.0.0-alpha.7` + ## \[1.0.0-alpha.7] ### Dependencies diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml index 2ce9d728efb6..677a13d3d195 100644 --- a/core/tauri-runtime-wry/Cargo.toml +++ b/core/tauri-runtime-wry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-runtime-wry" -version = "1.0.0-alpha.7" +version = "1.0.0-alpha.8" description = "Wry bindings to the Tauri runtime" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" @@ -15,8 +15,8 @@ rust-version = { workspace = true } [dependencies] wry = { version = "0.35", default-features = false, features = [ "file-drop", "protocol", "os-webview" ] } tao = { version = "0.24", default-features = false, features = [ "rwh_05" ] } -tauri-runtime = { version = "1.0.0-alpha.6", path = "../tauri-runtime" } -tauri-utils = { version = "2.0.0-alpha.11", path = "../tauri-utils" } +tauri-runtime = { version = "1.0.0-alpha.7", path = "../tauri-runtime" } +tauri-utils = { version = "2.0.0-alpha.12", path = "../tauri-utils" } raw-window-handle = "0.5" http = "0.2" diff --git a/core/tauri-runtime/CHANGELOG.md b/core/tauri-runtime/CHANGELOG.md index b61f75191ac0..7e6611035d57 100644 --- a/core/tauri-runtime/CHANGELOG.md +++ b/core/tauri-runtime/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[1.0.0-alpha.7] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-alpha.12` + ## \[1.0.0-alpha.6] ### Dependencies diff --git a/core/tauri-runtime/Cargo.toml b/core/tauri-runtime/Cargo.toml index 99586f4852b9..957f5d566ec7 100644 --- a/core/tauri-runtime/Cargo.toml +++ b/core/tauri-runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-runtime" -version = "1.0.0-alpha.6" +version = "1.0.0-alpha.7" 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-alpha.11", path = "../tauri-utils" } +tauri-utils = { version = "2.0.0-alpha.12", path = "../tauri-utils" } http = "0.2.4" raw-window-handle = "0.5" url = { version = "2" } diff --git a/core/tauri-utils/CHANGELOG.md b/core/tauri-utils/CHANGELOG.md index 0513f1c4bb83..3624300438b3 100644 --- a/core/tauri-utils/CHANGELOG.md +++ b/core/tauri-utils/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-alpha.12] + +### New Features + +- [\`\`](https://www.github.com/tauri-apps/tauri/commit/undefined) Add bundle DMG configuration options. + ## \[2.0.0-alpha.11] ### Breaking Changes diff --git a/core/tauri-utils/Cargo.toml b/core/tauri-utils/Cargo.toml index b9624529561f..0baf33f47dc4 100644 --- a/core/tauri-utils/Cargo.toml +++ b/core/tauri-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-utils" -version = "2.0.0-alpha.11" +version = "2.0.0-alpha.12" description = "Utilities for Tauri" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" diff --git a/core/tauri/CHANGELOG.md b/core/tauri/CHANGELOG.md index 79f5682e13cc..49753a49d42a 100644 --- a/core/tauri/CHANGELOG.md +++ b/core/tauri/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## \[2.0.0-alpha.20] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-alpha.12` +- Upgraded to `tauri-runtime@1.0.0-alpha.7` +- Upgraded to `tauri-runtime-wry@1.0.0-alpha.8` +- Upgraded to `tauri-macros@2.0.0-alpha.12` +- Upgraded to `tauri-build@2.0.0-alpha.13` + ## \[2.0.0-alpha.19] ### New Features diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 17380ae17a42..70ecac996c57 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri" -version = "2.0.0-alpha.19" +version = "2.0.0-alpha.20" description = "Make tiny, secure apps for all desktop platforms with Tauri" exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ] readme = "README.md" @@ -49,10 +49,10 @@ uuid = { version = "1", features = [ "v4" ], optional = true } url = { version = "2.4" } anyhow = "1.0" thiserror = "1.0" -tauri-runtime = { version = "1.0.0-alpha.6", path = "../tauri-runtime" } -tauri-macros = { version = "2.0.0-alpha.11", path = "../tauri-macros" } -tauri-utils = { version = "2.0.0-alpha.11", features = [ "resources" ], path = "../tauri-utils" } -tauri-runtime-wry = { version = "1.0.0-alpha.7", path = "../tauri-runtime-wry", optional = true } +tauri-runtime = { version = "1.0.0-alpha.7", path = "../tauri-runtime" } +tauri-macros = { version = "2.0.0-alpha.12", path = "../tauri-macros" } +tauri-utils = { version = "2.0.0-alpha.12", features = [ "resources" ], path = "../tauri-utils" } +tauri-runtime-wry = { version = "1.0.0-alpha.8", path = "../tauri-runtime-wry", optional = true } getrandom = "0.2" serde_repr = "0.1" state = "0.6" @@ -108,7 +108,7 @@ swift-rs = "1.0.6" [build-dependencies] heck = "0.4" -tauri-build = { path = "../tauri-build/", version = "2.0.0-alpha.12" } +tauri-build = { path = "../tauri-build/", version = "2.0.0-alpha.13" } [dev-dependencies] proptest = "1.4.0" diff --git a/tooling/bundler/CHANGELOG.md b/tooling/bundler/CHANGELOG.md index 3249edd5f4c2..451660c4dd53 100644 --- a/tooling/bundler/CHANGELOG.md +++ b/tooling/bundler/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-alpha.13] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-alpha.12` + ## \[2.0.0-alpha.12] ### Bug Fixes diff --git a/tooling/bundler/Cargo.toml b/tooling/bundler/Cargo.toml index 5631d5041434..99f0d51a985a 100644 --- a/tooling/bundler/Cargo.toml +++ b/tooling/bundler/Cargo.toml @@ -2,7 +2,7 @@ workspace = { } [package] name = "tauri-bundler" -version = "2.0.0-alpha.12" +version = "2.0.0-alpha.13" authors = [ "George Burton ", "Tauri Programme within The Commons Conservancy" @@ -17,7 +17,7 @@ rust-version = "1.70" exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ] [dependencies] -tauri-utils = { version = "2.0.0-alpha.11", path = "../../core/tauri-utils", features = [ "resources" ] } +tauri-utils = { version = "2.0.0-alpha.12", path = "../../core/tauri-utils", features = [ "resources" ] } image = "0.24.7" libflate = "2.0" anyhow = "1.0" diff --git a/tooling/cli/CHANGELOG.md b/tooling/cli/CHANGELOG.md index 22b3e36b97c8..788d52c79f19 100644 --- a/tooling/cli/CHANGELOG.md +++ b/tooling/cli/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## \[2.0.0-alpha.20] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-alpha.12` +- Upgraded to `tauri-bundler@2.0.0-alpha.13` + ## \[2.0.0-alpha.19] ### Enhancements diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index 41f122a59d12..afe9f3f42c96 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -4015,7 +4015,7 @@ dependencies = [ [[package]] name = "tauri-bundler" -version = "2.0.0-alpha.12" +version = "2.0.0-alpha.13" dependencies = [ "anyhow", "ar", @@ -4042,7 +4042,7 @@ dependencies = [ "strsim", "tar", "tauri-icns", - "tauri-utils 2.0.0-alpha.11", + "tauri-utils 2.0.0-alpha.12", "tempfile", "thiserror", "time", @@ -4056,7 +4056,7 @@ dependencies = [ [[package]] name = "tauri-cli" -version = "2.0.0-alpha.19" +version = "2.0.0-alpha.20" dependencies = [ "anyhow", "axum", @@ -4106,7 +4106,7 @@ dependencies = [ "tauri-bundler", "tauri-icns", "tauri-utils 1.5.0", - "tauri-utils 2.0.0-alpha.11", + "tauri-utils 2.0.0-alpha.12", "thiserror", "tokio", "toml 0.8.8", @@ -4172,7 +4172,7 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-alpha.11" +version = "2.0.0-alpha.12" dependencies = [ "aes-gcm", "ctor 0.2.5", diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index c96ec164675d..32d604791805 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -3,7 +3,7 @@ members = [ "node" ] [package] name = "tauri-cli" -version = "2.0.0-alpha.19" +version = "2.0.0-alpha.20" authors = [ "Tauri Programme within The Commons Conservancy" ] edition = "2021" rust-version = "1.70" @@ -49,7 +49,7 @@ sublime_fuzzy = "0.7" clap_complete = "4" clap = { version = "4.4", features = [ "derive", "env" ] } anyhow = "1.0" -tauri-bundler = { version = "2.0.0-alpha.12", default-features = false, path = "../bundler" } +tauri-bundler = { version = "2.0.0-alpha.13", default-features = false, path = "../bundler" } colored = "2.0" serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" @@ -59,7 +59,7 @@ shared_child = "1.0" duct = "0.13" toml_edit = "0.20" json-patch = "1.2" -tauri-utils = { version = "2.0.0-alpha.11", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] } +tauri-utils = { version = "2.0.0-alpha.12", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] } tauri-utils-v1 = { version = "1", package = "tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] } toml = "0.8" jsonschema = "0.17" diff --git a/tooling/cli/metadata-v2.json b/tooling/cli/metadata-v2.json index 4317f0f6a937..38a20e5d2fb1 100644 --- a/tooling/cli/metadata-v2.json +++ b/tooling/cli/metadata-v2.json @@ -1,8 +1,8 @@ { "cli.js": { - "version": "2.0.0-alpha.19", + "version": "2.0.0-alpha.20", "node": ">= 10.0.0" }, - "tauri": "2.0.0-alpha.19", - "tauri-build": "2.0.0-alpha.12" + "tauri": "2.0.0-alpha.20", + "tauri-build": "2.0.0-alpha.13" } diff --git a/tooling/cli/node/CHANGELOG.md b/tooling/cli/node/CHANGELOG.md index be1f29111d24..8ac1a46485ce 100644 --- a/tooling/cli/node/CHANGELOG.md +++ b/tooling/cli/node/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-alpha.20] + +### Dependencies + +- Upgraded to `tauri-cli@2.0.0-alpha.20` + ## \[2.0.0-alpha.19] ### Dependencies diff --git a/tooling/cli/node/package.json b/tooling/cli/node/package.json index 2f91902cf111..57e28ca43bf4 100644 --- a/tooling/cli/node/package.json +++ b/tooling/cli/node/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/cli", - "version": "2.0.0-alpha.19", + "version": "2.0.0-alpha.20", "description": "Command line interface for building Tauri apps", "funding": { "type": "opencollective",