chore: update deps, make mobile script paths relative

pull/649/head
Lucas Nogueira 2 years ago
parent 8902fe9adf
commit bcd63cd4a1
No known key found for this signature in database
GPG Key ID: 7C32FCA95C8C95D7

@ -0,0 +1,6 @@
---
"window-state": patch
"persisted-scope": patch
---
Update to tauri@alpha.15.

34
Cargo.lock generated

@ -3047,9 +3047,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.19"
version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
dependencies = [
"value-bag",
]
@ -5528,9 +5528,9 @@ checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e"
[[package]]
name = "tauri"
version = "2.0.0-alpha.14"
version = "2.0.0-alpha.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46acc0b6d20fe3a7c27e6036d9ef52d2c28afd1b6178ffc2dd4881f9994fecd7"
checksum = "cd8f1dc82ad6bf8a689b131febee60020e84193b7fdb9c21bbb344c3d9f25de4"
dependencies = [
"anyhow",
"bytes 1.4.0",
@ -5581,9 +5581,9 @@ dependencies = [
[[package]]
name = "tauri-build"
version = "2.0.0-alpha.8"
version = "2.0.0-alpha.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc47d3c84f4aeac397cd956267f3b8060c5a2dba78288a5ccf9a8b7a8c1e7025"
checksum = "59048e05398d7d53e2d73d7f7fd14fbab53ec9f90f4b91e3c08f263e07ffc569"
dependencies = [
"anyhow",
"cargo_toml",
@ -5603,9 +5603,9 @@ dependencies = [
[[package]]
name = "tauri-codegen"
version = "2.0.0-alpha.7"
version = "2.0.0-alpha.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f98a67c7ef3cb3c25de91fe1fa16cc3681997f6ec99da0a7496d6feae2ea91e"
checksum = "d8acf40451edf9ccd16d110cb10e9959fec6ccca286c5cc66b859878f8aa9a7b"
dependencies = [
"base64 0.21.2",
"brotli",
@ -5629,9 +5629,9 @@ dependencies = [
[[package]]
name = "tauri-macros"
version = "2.0.0-alpha.7"
version = "2.0.0-alpha.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b01cb5f945c71e040c5d191c32598565ae26cc266a9d5d4f7dd2dc324c5cfdd0"
checksum = "c7037ba4260be47f4d6dab8c781bd15910ef1d3c16c74bf3e3c47e69c250ab82"
dependencies = [
"heck",
"proc-macro2",
@ -6037,14 +6037,13 @@ dependencies = [
[[package]]
name = "tauri-runtime"
version = "1.0.0-alpha.1"
version = "1.0.0-alpha.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "525c4dea52547a13e58816c655bd0928f6c30026515e7b2a77166bcd984da6d0"
checksum = "d34b124f7731f3981deba3b643b2f1c8eaff59f3d6929edb401e1fc929ad93df"
dependencies = [
"gtk",
"http",
"jni",
"rand 0.8.5",
"raw-window-handle",
"serde",
"serde_json",
@ -6057,9 +6056,9 @@ dependencies = [
[[package]]
name = "tauri-runtime-wry"
version = "1.0.0-alpha.2"
version = "1.0.0-alpha.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fce46e920b62699045e02db3006017d24324119189dfab2b12261aeebf98f4be"
checksum = "7b94248fbaf1169c1fb085a2c43f49af3de650f6972a64d6f2bdf876c60949d5"
dependencies = [
"cocoa 0.24.1",
"gtk",
@ -6079,9 +6078,9 @@ dependencies = [
[[package]]
name = "tauri-utils"
version = "2.0.0-alpha.7"
version = "2.0.0-alpha.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06bcd7c6f67fd6371dcc22da7d7f26ec12c4eae26ad7bc54943bb9f35b5db302"
checksum = "931ead8db578bc2f9aee6636345fe5b900cfa2b9985a1783913200fab5e607f1"
dependencies = [
"aes-gcm 0.10.2",
"brotli",
@ -6094,6 +6093,7 @@ dependencies = [
"infer 0.12.0",
"json-patch",
"kuchikiki",
"log",
"memchr",
"phf 0.10.1",
"proc-macro2",

@ -5,8 +5,8 @@ resolver = "2"
[workspace.dependencies]
serde = { version = "1", features = ["derive"] }
log = "0.4"
tauri = "2.0.0-alpha.12"
tauri-build = "2.0.0-alpha.8"
tauri = "2.0.0-alpha.15"
tauri-build = "2.0.0-alpha.9"
serde_json = "1"
thiserror = "1"

@ -30,7 +30,7 @@
"@iconify-json/codicon": "^1.1.26",
"@iconify-json/ph": "^1.1.5",
"@sveltejs/vite-plugin-svelte": "^2.4.1",
"@tauri-apps/cli": "2.0.0-alpha.14",
"@tauri-apps/cli": "2.0.0-alpha.15",
"@unocss/extractor-svelte": "^0.53.1",
"internal-ip": "^8.0.0",
"svelte": "^3.59.1",

@ -32,7 +32,7 @@ open class BuildTask : DefaultTask() {
val rootDirRel = rootDirRel ?: throw GradleException("rootDirRel cannot be null")
val target = target ?: throw GradleException("target cannot be null")
val release = release ?: throw GradleException("release cannot be null")
val args = listOf("/Users/lucas/projects/tauri/plugins-workspace/examples/api/./node_modules/.bin/../../../../node_modules/.pnpm/@tauri-apps+cli@2.0.0-alpha.14/node_modules/@tauri-apps/cli/tauri.js", "android", "android-studio-script");
val args = listOf("../node_modules/.bin/../@tauri-apps/cli/tauri.js", "android", "android-studio-script");
project.exec {
workingDir(File(project.projectDir, rootDirRel))

@ -234,7 +234,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "node /Users/lucas/projects/tauri/plugins-workspace/examples/api/./node_modules/.bin/../../../../node_modules/.pnpm/@tauri-apps+cli@2.0.0-alpha.14/node_modules/@tauri-apps/cli/tauri.js ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths \"${FRAMEWORK_SEARCH_PATHS:?}\" --header-search-paths \"${HEADER_SEARCH_PATHS:?}\" --gcc-preprocessor-definitions \"${GCC_PREPROCESSOR_DEFINITIONS:-}\" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}";
shellScript = "node ../../../node_modules/.bin/../@tauri-apps/cli/tauri.js ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths \"${FRAMEWORK_SEARCH_PATHS:?}\" --header-search-paths \"${HEADER_SEARCH_PATHS:?}\" --gcc-preprocessor-definitions \"${GCC_PREPROCESSOR_DEFINITIONS:-}\" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}";
};
/* End PBXShellScriptBuildPhase section */

@ -40,7 +40,5 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>NSCameraUsageDescription</key>
<string>To be able to scan barcodes</string>
</dict>
</plist>

@ -1,7 +1,3 @@
# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
# SPDX-License-Identifier: Apache-2.0
# SPDX-License-Identifier: MIT
name: api
options:
bundleIdPrefix: com.tauri
@ -84,7 +80,7 @@ targets:
- sdk: UIKit.framework
- sdk: WebKit.framework
preBuildScripts:
- script: node /Users/lucas/projects/tauri/plugins-workspace/examples/api/./node_modules/.bin/../../../../node_modules/.pnpm/@tauri-apps+cli@2.0.0-alpha.14/node_modules/@tauri-apps/cli/tauri.js ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths "${FRAMEWORK_SEARCH_PATHS:?}" --header-search-paths "${HEADER_SEARCH_PATHS:?}" --gcc-preprocessor-definitions "${GCC_PREPROCESSOR_DEFINITIONS:-}" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}
- script: node ../../../node_modules/.bin/../@tauri-apps/cli/tauri.js ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths "${FRAMEWORK_SEARCH_PATHS:?}" --header-search-paths "${HEADER_SEARCH_PATHS:?}" --gcc-preprocessor-definitions "${GCC_PREPROCESSOR_DEFINITIONS:-}" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}
name: Build Rust Code
basedOnDependencyAnalysis: false
outputFiles:

@ -101,7 +101,7 @@ pub fn create_tray<R: Runtime>(app: &tauri::AppHandle<R>) -> tauri::Result<()> {
_ => {}
})
.on_tray_event(|tray, event| {
.on_tray_icon_event(|tray, event| {
if event.click_type == ClickType::Left {
let app = tray.app_handle();
if let Some(window) = app.get_window("main") {

@ -14,7 +14,7 @@
"@tauri-apps/plugin-deep-link": "2.0.0-alpha.0"
},
"devDependencies": {
"@tauri-apps/cli": "^2.0.0-alpha.14",
"@tauri-apps/cli": "^2.0.0-alpha.15",
"internal-ip": "^7.0.0",
"typescript": "^4.8.2",
"vite": "^4.2.1"

@ -1,5 +1,5 @@
{
"$schema": "../../../node_modules/.pnpm/@tauri-apps+cli@2.0.0-alpha.14/node_modules/@tauri-apps/cli/schema.json",
"$schema": "../../../node_modules/.pnpm/@tauri-apps+cli@2.0.0-alpha.15/node_modules/@tauri-apps/cli/schema.json",
"build": {
"distDir": ".",
"devPath": "http://localhost:4000"

@ -1,5 +1,5 @@
{
"$schema": "../../../node_modules/.pnpm/@tauri-apps+cli@2.0.0-alpha.14/node_modules/@tauri-apps/cli/schema.json",
"$schema": "../../../node_modules/.pnpm/@tauri-apps+cli@2.0.0-alpha.15/node_modules/@tauri-apps/cli/schema.json",
"build": {
"distDir": ".",
"devPath": "http://localhost:4000"

@ -15,7 +15,8 @@ use aho_corasick::AhoCorasick;
use serde::{Deserialize, Serialize};
use tauri::{
plugin::{Builder, TauriPlugin},
GlobPattern, Manager, Runtime,
scope::fs::Pattern as GlobPattern,
Manager, Runtime,
};
#[cfg(feature = "protocol-asset")]
use tauri::{FsScope, FsScopeEvent};
@ -117,8 +118,6 @@ enum Error {
#[error(transparent)]
Tauri(#[from] tauri::Error),
#[error(transparent)]
TauriApi(#[from] tauri::api::Error),
#[error(transparent)]
Bincode(#[from] Box<bincode::ErrorKind>),
}

@ -9,6 +9,6 @@
"author": "",
"license": "MIT",
"devDependencies": {
"@tauri-apps/cli": "2.0.0-alpha.14"
"@tauri-apps/cli": "2.0.0-alpha.15"
}
}

@ -42,7 +42,7 @@ export default class Database {
*
* # Sqlite
*
* The path is relative to `tauri::api::path::BaseDirectory::App` and must start with `sqlite:`.
* The path is relative to `tauri::path::BaseDirectory::App` and must start with `sqlite:`.
*
* @example
* ```ts
@ -66,7 +66,7 @@ export default class Database {
*
* # Sqlite
*
* The path is relative to `tauri::api::path::BaseDirectory::App` and must start with `sqlite:`.
* The path is relative to `tauri::path::BaseDirectory::App` and must start with `sqlite:`.
*
* @example
* ```ts

@ -1,5 +1,5 @@
{
"$schema": "../../../../node_modules/.pnpm/@tauri-apps+cli@2.0.0-alpha.14/node_modules/@tauri-apps/cli/schema.json",
"$schema": "../../../../node_modules/.pnpm/@tauri-apps+cli@2.0.0-alpha.15/node_modules/@tauri-apps/cli/schema.json",
"build": {
"distDir": [],
"devPath": []

@ -13,7 +13,7 @@
"devDependencies": {
"@sveltejs/adapter-static": "1.0.0-next.50",
"@sveltejs/kit": "1.22.3",
"@tauri-apps/cli": "2.0.0-alpha.14",
"@tauri-apps/cli": "2.0.0-alpha.15",
"svelte": "4.0.5",
"svelte-check": "3.4.6",
"tslib": "2.6.0",

@ -38,8 +38,6 @@ pub enum Error {
#[error(transparent)]
Tauri(#[from] tauri::Error),
#[error(transparent)]
TauriApi(#[from] tauri::api::Error),
#[error(transparent)]
Bincode(#[from] Box<bincode::ErrorKind>),
}

@ -122,8 +122,8 @@ importers:
specifier: ^2.4.1
version: 2.4.1(svelte@3.59.1)(vite@4.4.4)
'@tauri-apps/cli':
specifier: 2.0.0-alpha.14
version: 2.0.0-alpha.14
specifier: 2.0.0-alpha.15
version: 2.0.0-alpha.15
'@unocss/extractor-svelte':
specifier: ^0.53.1
version: 0.53.1
@ -220,8 +220,8 @@ importers:
version: link:../..
devDependencies:
'@tauri-apps/cli':
specifier: ^2.0.0-alpha.14
version: 2.0.0-alpha.14
specifier: ^2.0.0-alpha.15
version: 2.0.0-alpha.15
internal-ip:
specifier: ^7.0.0
version: 7.0.0
@ -335,8 +335,8 @@ importers:
plugins/single-instance/examples/vanilla:
devDependencies:
'@tauri-apps/cli':
specifier: 2.0.0-alpha.14
version: 2.0.0-alpha.14
specifier: 2.0.0-alpha.15
version: 2.0.0-alpha.15
plugins/sql:
dependencies:
@ -411,8 +411,8 @@ importers:
specifier: 1.22.3
version: 1.22.3(svelte@4.0.5)(vite@4.4.4)
'@tauri-apps/cli':
specifier: 2.0.0-alpha.14
version: 2.0.0-alpha.14
specifier: 2.0.0-alpha.15
version: 2.0.0-alpha.15
svelte:
specifier: 4.0.5
version: 4.0.5
@ -1371,7 +1371,7 @@ packages:
engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
dev: false
/@tauri-apps/cli-darwin-arm64@2.0.0-alpha.14:
/@tauri-apps/cli-darwin-arm64@2.0.0-alpha.15:
resolution: {integrity: sha512-3K416rvSUt8el/fdPnSnHJOI2j5Os9Kyy17XZp+z3PKRRuo/iJPp9L3w0zFGYsh7C+ylzV4OBUSVTi+e+gO5qA==}
engines: {node: '>= 10'}
cpu: [arm64]
@ -1380,7 +1380,7 @@ packages:
dev: true
optional: true
/@tauri-apps/cli-darwin-x64@2.0.0-alpha.14:
/@tauri-apps/cli-darwin-x64@2.0.0-alpha.15:
resolution: {integrity: sha512-aLEUGG8Z0UpTENe4/UG6DU8bnB2e1uxyxYvcmFKrHv+EAtR9nLH14alBxPl2K54YXy3JLR4bKROW15a/sFrX9g==}
engines: {node: '>= 10'}
cpu: [x64]
@ -1389,7 +1389,7 @@ packages:
dev: true
optional: true
/@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.14:
/@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.15:
resolution: {integrity: sha512-Lu7unNvurBccxfHIaUQ0gPgUioTkQBMtWGrqO/auZ/JbjPR1W2eBlRwVNXf+nBWX9HwomPR3YD5yZuZmzxRV2g==}
engines: {node: '>= 10'}
cpu: [arm]
@ -1398,7 +1398,7 @@ packages:
dev: true
optional: true
/@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.14:
/@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.15:
resolution: {integrity: sha512-g8HkwKvAsWLLMJzPup7B1BCilYmXKwXdee7sf8QFbaIUSccR8i5pXLK5N/quKw5lmldYgFveEyuW9Qs8RgTYnQ==}
engines: {node: '>= 10'}
cpu: [arm64]
@ -1407,7 +1407,7 @@ packages:
dev: true
optional: true
/@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.14:
/@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.15:
resolution: {integrity: sha512-ag4UuX6zg7vmBFWmg9ChyiJI7GTMkc8tjr/qobd3Lg9ddmjnVWwLUHt6v1kYhXiU7iLPD5DYDIjU8x/POc3hSA==}
engines: {node: '>= 10'}
cpu: [arm64]
@ -1416,7 +1416,7 @@ packages:
dev: true
optional: true
/@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.14:
/@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.15:
resolution: {integrity: sha512-+CviROc4fzrGqqyHQXh3uc2dGr/oYr19I8r2k+LJ2CDfmtj7CbNd/oC5oehHbHdw1oGFKuDPudrTGvzdRNygYA==}
engines: {node: '>= 10'}
cpu: [x64]
@ -1425,7 +1425,7 @@ packages:
dev: true
optional: true
/@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.14:
/@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.15:
resolution: {integrity: sha512-aCP51HOAQXgVhyPHXKy627bYVRkNnpCvSU3L03pYV8YDoGo+veeuek5UiW7PlNdwx52B/yC3Jz7Dr3gEbFimfQ==}
engines: {node: '>= 10'}
cpu: [x64]
@ -1434,7 +1434,7 @@ packages:
dev: true
optional: true
/@tauri-apps/cli-win32-arm64-msvc@2.0.0-alpha.14:
/@tauri-apps/cli-win32-arm64-msvc@2.0.0-alpha.15:
resolution: {integrity: sha512-b6Ei5ERUF0KS1bttM7i6U62GmjIvlgK03XZqvL/KLNvUfqRMu8F7JA1ejSExgTxhEhKSWA768HiTXpXk2GjFFw==}
engines: {node: '>= 10'}
cpu: [arm64]
@ -1443,7 +1443,7 @@ packages:
dev: true
optional: true
/@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.14:
/@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.15:
resolution: {integrity: sha512-TDkvu5pd37bKxZ6N+BqngCNGcefY7aHxyJ3BdBGxF+wRMjEMh70mgEXk8i0uM/aUi/Kl1GQoO6xJfUDlIMPXOA==}
engines: {node: '>= 10'}
cpu: [ia32]
@ -1452,7 +1452,7 @@ packages:
dev: true
optional: true
/@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.14:
/@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.15:
resolution: {integrity: sha512-9yfoEe2RSykKr5hCifVAL5o0gHXgRCS+Wo+RJjQ9L2+QHY7XPLZYAhj/h8jdcAdRveyIQwat3k7wl+SW87v1eg==}
engines: {node: '>= 10'}
cpu: [x64]
@ -1461,21 +1461,21 @@ packages:
dev: true
optional: true
/@tauri-apps/cli@2.0.0-alpha.14:
/@tauri-apps/cli@2.0.0-alpha.15:
resolution: {integrity: sha512-4/IQwN5S94D6LTXQrDWbSea0pGb9TTC4BwxHUFmhep4NjFxms161v1zadAUIsq/N2x6WwCBGrsdq9SIkgKv49Q==}
engines: {node: '>= 10'}
hasBin: true
optionalDependencies:
'@tauri-apps/cli-darwin-arm64': 2.0.0-alpha.14
'@tauri-apps/cli-darwin-x64': 2.0.0-alpha.14
'@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-alpha.14
'@tauri-apps/cli-linux-arm64-gnu': 2.0.0-alpha.14
'@tauri-apps/cli-linux-arm64-musl': 2.0.0-alpha.14
'@tauri-apps/cli-linux-x64-gnu': 2.0.0-alpha.14
'@tauri-apps/cli-linux-x64-musl': 2.0.0-alpha.14
'@tauri-apps/cli-win32-arm64-msvc': 2.0.0-alpha.14
'@tauri-apps/cli-win32-ia32-msvc': 2.0.0-alpha.14
'@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.14
'@tauri-apps/cli-darwin-arm64': 2.0.0-alpha.15
'@tauri-apps/cli-darwin-x64': 2.0.0-alpha.15
'@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-alpha.15
'@tauri-apps/cli-linux-arm64-gnu': 2.0.0-alpha.15
'@tauri-apps/cli-linux-arm64-musl': 2.0.0-alpha.15
'@tauri-apps/cli-linux-x64-gnu': 2.0.0-alpha.15
'@tauri-apps/cli-linux-x64-musl': 2.0.0-alpha.15
'@tauri-apps/cli-win32-arm64-msvc': 2.0.0-alpha.15
'@tauri-apps/cli-win32-ia32-msvc': 2.0.0-alpha.15
'@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.15
dev: true
/@tauri-apps/toml@2.2.4:

Loading…
Cancel
Save