Merge branch 'dev' into fix/macos-rebuild-every-rerun

.changes/build-android-version-check.md

@@ -0,0 +1,5 @@
+---
+"tauri-build": patch:enhance
+---
+
+Check for Android version code before building the package in release mode.

.changes/build-resource-target-same-src.md

@@ -0,0 +1,6 @@
+---
+"tauri-build": "patch:bug"
+---
+
+Avoid copying resources if the target path is the same as source.
+

.changes/cli-add-launchscreen-storyboard.md

@@ -0,0 +1,6 @@
+---
+'tauri-cli': 'patch:enhance'
+'@tauri-apps/cli': 'patch:enhance'
+---
+
+Add a blank LaunchScreen.storyboard to the iOS project init template to pass the App Store validation.

.changes/cli-allow-kotlin-keyword-as-ident.md

@@ -0,0 +1,5 @@
+---
+"tauri-cli": "patch:enhance"
+---
+
+On Android, allow using Kotlin keywords as identifiers and escape them in templates.

.changes/cli-perserve-cargo-bin-name.md

@@ -0,0 +1,7 @@
+---
+"tauri-cli": "patch:breaking"
+"@tauri-apps/cli": "patch:breaking"
+---
+
+Avoid renaming main binary to product name and perserve the name generated by cargo.
+

.changes/core-env-args.md

@@ -0,0 +1,6 @@
+---
+"tauri": "patch:breaking"
+---
+
+Include binary path in `Env.args_os`, previously it was skipped.
+

.changes/fix-macos-deep-link-cfbundleurlname.md

@@ -0,0 +1,5 @@
+---
+tauri-bundler: "patch:bug"
+---
+
+Fixed an issue causing the deep link feature to create invalid `Info.plist` values on macOS.

.changes/pre.json

@@ -24,7 +24,10 @@
     ".changes/assets-setup.md",
     ".changes/beta.md",
     ".changes/better-error-for-invalid-plugin-config.md",
+    ".changes/build-android-version-check.md",
+    ".changes/build-resource-target-same-src.md",
     ".changes/build-schema-generation.md",
+    ".changes/bunderl-installer-hooks.md",
     ".changes/bundler-deep-link-reg-path.md",
     ".changes/bundler-license.md",
     ".changes/bundler-long_description.md",
@@ -33,13 +36,16 @@
     ".changes/bundler-r-flag.md",
     ".changes/bundler-resources-unix.md",
     ".changes/bundler-rpm-license.md",
+    ".changes/bundler-shortcuts-updating.md",
     ".changes/capabilities-multiwebview.md",
     ".changes/capabilities-tauri-conf.md",
     ".changes/capability-builder-platform.md",
     ".changes/capability-context-refactor.md",
     ".changes/cleanup-resource-table.md",
     ".changes/cli-acl-subcommands.md",
     ".changes/cli-add-@-spec.md",
+    ".changes/cli-add-launchscreen-storyboard.md",
+    ".changes/cli-allow-kotlin-keyword-as-ident.md",
     ".changes/cli-build-no-bundle.md",
     ".changes/cli-chinese-product-name.md",
     ".changes/cli-ds-store-dev-watch.md",
@@ -51,6 +57,7 @@
     ".changes/cli-migrate-unknown-plugins.md",
     ".changes/cli-mobile-init-partition.md",
     ".changes/cli-openssl-cargo-mobile2-removal.md",
+    ".changes/cli-perserve-cargo-bin-name.md",
     ".changes/cli-plugin-android-init.md",
     ".changes/cli-plugins-migrate.md",
     ".changes/cli-update-deps-fix-log.md",
@@ -71,6 +78,7 @@
     ".changes/core-center-window.md",
     ".changes/core-emit-created-events.md",
     ".changes/core-emit-js-all-targets.md",
+    ".changes/core-env-args.md",
     ".changes/core-isTauri.md",
     ".changes/core-js-event-anytarget.md",
     ".changes/core-jsimage-intoimg.md",
@@ -80,9 +88,11 @@
     ".changes/core-specta-integration.md",
     ".changes/core-start-resize-permission.md",
     ".changes/core-window-hasdisplayhandle.md",
+    ".changes/core-windows-menubar-theme.md",
     ".changes/csp-header-linux.md",
     ".changes/cursor_position.md",
     ".changes/cursor_position_js.md",
+    ".changes/custom-sign-command.md",
     ".changes/deb-rpm-post-pre-scripts-bundler.md",
     ".changes/deb-rpm-post-pre-scripts-config.md",
     ".changes/deb-rpm-provides-conflicts-replaces.md",
@@ -115,6 +125,7 @@
     ".changes/fix-invoke-devtools-by-hotkey.md",
     ".changes/fix-ios-dev-logs.md",
     ".changes/fix-ipc-error-json.md",
+    ".changes/fix-macos-deep-link-cfbundleurlname.md",
     ".changes/fix-menu-remove-api.md",
     ".changes/fix-metadata-on-close.md",
     ".changes/fix-migrate-updater.md",
@@ -155,6 +166,7 @@
     ".changes/ipc-request-param-refactor.md",
     ".changes/isolation-pattern-key-extractable.md",
     ".changes/isolation-script-remove-itself.md",
+    ".changes/mobile-use-identifier-as-id.md",
     ".changes/mobile-watcher.md",
     ".changes/monitor-from-point-js.md",
     ".changes/monitor-from-point.md",
@@ -166,6 +178,7 @@
     ".changes/permission-table.md",
     ".changes/plugin-global-api-script.md",
     ".changes/plugin-init-script-context.md",
+    ".changes/plugin-ios-xcode-project.md",
     ".changes/preserve-channel-order.md",
     ".changes/progress-bar-state-refactor.md",
     ".changes/re-export-progress-bar-status.md",
@@ -187,17 +200,25 @@
     ".changes/runtime-capability-dynamic.md",
     ".changes/runtime-dpi-mod-moved.md",
     ".changes/runtime-icon-lifetime.md",
+    ".changes/runtime-window-builder-get-theme.md",
+    ".changes/rustc-check-cfg.md",
     ".changes/rwh-06.md",
     ".changes/schema_str.md",
     ".changes/script-older-os.md",
     ".changes/set-auto-resize.md",
     ".changes/set-zoom.md",
+    ".changes/skip-webview-install-mod.md",
     ".changes/strict-csp-isolation-frame.md",
     ".changes/tauri-build-codegen-capabilities.md",
     ".changes/tauri-build-dev-changes.md",
+    ".changes/tauri-build-dev-fn.md",
+    ".changes/tauri-bundle-command.md",
     ".changes/tauri-cli-add-default-perm.md",
     ".changes/tauri-close-requested-target-specific.md",
+    ".changes/tauri-codegen-use-correct-env.md",
     ".changes/tauri-context-icon-methods.md",
+    ".changes/tauri-correct-platform-file.md",
+    ".changes/tauri-dev-fn-const.md",
     ".changes/tauri-error-sync.md",
     ".changes/tauri-icon-removed.md",
     ".changes/tauri-image-codegen.md",
@@ -207,22 +228,29 @@
     ".changes/tauri-runtime-webview-events.md",
     ".changes/tauri-scope-object-error-sync.md",
     ".changes/tauri-utils-capability-refactor.md",
+    ".changes/tauri-utils-package-name-removed.md",
     ".changes/tauri-utils-plugin-module.md",
     ".changes/tauri-webview-events.md",
+    ".changes/tauri-window-origin-default-to-null.md",
+    ".changes/tray-icon-event.md",
     ".changes/tray-icon-rect.md",
     ".changes/tray-rect.md",
     ".changes/truncate-before-write-buildtask.md",
     ".changes/unstable-child-webview.md",
     ".changes/update-acl-paths-cli.md",
     ".changes/update-app-template-capabilities-conf.md",
+    ".changes/update-gradle.md",
     ".changes/update-plugin-template.md",
+    ".changes/update-target-sdk.md",
     ".changes/url-result-runtime.md",
     ".changes/url-result.md",
     ".changes/utils-bundle-target-all.md",
     ".changes/utils-bundle-type-all.md",
     ".changes/utils-debug-eprintln.md",
+    ".changes/utils-installer-hooks.md",
     ".changes/utils-named-capability-file.md",
     ".changes/utils-remove-asset-trait.md",
+    ".changes/utils-sign-command.md",
     ".changes/webview-bounds.md",
     ".changes/wry-0.36.md",
     ".changes/wry-0.37.md",

.changes/tauri-build-dev-fn.md

@@ -0,0 +1,5 @@
+---
+"tauri-build": "patch:breaking"
+---
+
+Renamed `dev` function to `is_dev`

.changes/tauri-codegen-use-correct-env.md

@@ -0,0 +1,5 @@
+---
+"tauri-codegen": "patch"
+---
+
+Use `TAURI_ENV_TARGET_TRIPLE` (which is set by `tauri-build`) to determine the target when reading the config file.

.changes/tauri-correct-platform-file.md

@@ -0,0 +1,6 @@
+---
+"tauri": "patch:bug"
+---
+
+Parse the correct platform `tauri.<platform>.conf.json` config file when building or developing for mobile.
+

.changes/tauri-dev-fn-const.md

@@ -0,0 +1,5 @@
+---
+"tauri": "patch:breaking"
+---
+
+Renamed `dev` function to `is_dev` and marked it as `const fn`

.changes/tauri-utils-package-name-removed.md

@@ -0,0 +1,6 @@
+---
+"tauri-utils": "patch:breaking"
+---
+
+Removed `Config::binary_name` and `PackageInfo::package_name`
+

.changes/tauri-window-origin-default-to-null.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'patch:bug'
+---
+
+Set default window origin to `null`. Prevent window crash when loading `about:blank`.

.changes/update-gradle.md

@@ -0,0 +1,6 @@
+---
+"tauri-cli": patch:enhance
+"@tauri-apps/cli": patch:enhance
+---
+
+Update to latest gradle.

core/tauri-build/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## \[2.0.0-beta.17]
+
+### Enhancements
+
+- [`adac2185a`](https://www.github.com/tauri-apps/tauri/commit/adac2185a3e2e65a89a3c392363c50ddde4acff2)([#9898](https://www.github.com/tauri-apps/tauri/pull/9898)) Check for Android version code before building the package in release mode.
+
+### Bug Fixes
+
+- [`19b696b61`](https://www.github.com/tauri-apps/tauri/commit/19b696b61c95ced0f07dd7471565ad329a0badcf)([#9710](https://www.github.com/tauri-apps/tauri/pull/9710)) Avoid copying resources if the target path is the same as source.
+
+### What's Changed
+
+- [`9ac930380`](https://www.github.com/tauri-apps/tauri/commit/9ac930380a5df3fe700e68e75df8684d261ca292)([#9850](https://www.github.com/tauri-apps/tauri/pull/9850)) Emit `cargo:rustc-check-cfg` instruction so Cargo validates custom cfg attributes on Rust 1.80 (or nightly-2024-05-05).
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.17`
+- Upgraded to `tauri-codegen@2.0.0-beta.17`
+
+### Breaking Changes
+
+- [`1df5cdeb0`](https://www.github.com/tauri-apps/tauri/commit/1df5cdeb06f5464e0eec4055e21b7b7bc8739eed)([#9858](https://www.github.com/tauri-apps/tauri/pull/9858)) Use `tauri.conf.json > identifier` to set the `PackageName` in Android and `BundleId` in iOS.
+- [`aaecb6a72`](https://www.github.com/tauri-apps/tauri/commit/aaecb6a72e5d1462967cc910c2628999997742d0)([#9890](https://www.github.com/tauri-apps/tauri/pull/9890)) Renamed `dev` function to `is_dev`
+
 ## \[2.0.0-beta.16]
 
 ### Dependencies

core/tauri-build/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-build"
-version = "2.0.0-beta.16"
+version = "2.0.0-beta.17"
 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-beta.16", path = "../tauri-codegen", optional = true }
-tauri-utils = { version = "2.0.0-beta.16", path = "../tauri-utils", features = [ "build", "resources" ] }
+tauri-codegen = { version = "2.0.0-beta.17", path = "../tauri-codegen", optional = true }
+tauri-utils = { version = "2.0.0-beta.17", path = "../tauri-utils", features = [ "build", "resources" ] }
 cargo_toml = "0.17"
 serde = "1"
 serde_json = "1"

core/tauri-build/src/codegen/context.rs

@@ -121,7 +121,7 @@ impl CodegenContext {
     );
 
     let code = context_codegen(ContextData {
-      dev: crate::dev(),
+      dev: crate::is_dev(),
       config,
       config_parent,
       // it's very hard to have a build script for unit tests, so assume this is always called from