From 92e346578a179a71b1aa94354182e3974cde5a7c Mon Sep 17 00:00:00 2001 From: John Costa Date: Sat, 3 May 2025 13:00:22 +0100 Subject: [PATCH] chore: removing submodule of forked version of sharetarget --- .gitmodules | 3 --- frontend/bun.lock | 4 ++-- frontend/package.json | 2 +- frontend/src-tauri/Cargo.lock | 2 ++ frontend/src-tauri/Cargo.toml | 4 ++-- frontend/src-tauri/capabilities/ios.toml | 8 ++++++++ frontend/src-tauri/capabilities/mobile.toml | 1 - frontend/src-tauri/src/lib.rs | 17 +++++++++++------ tauri-plugin-sharetarget | 1 - 9 files changed, 26 insertions(+), 16 deletions(-) delete mode 100644 .gitmodules create mode 100644 frontend/src-tauri/capabilities/ios.toml delete mode 160000 tauri-plugin-sharetarget diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 9fd2c24..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "tauri-plugin-sharetarget"] - path = tauri-plugin-sharetarget - url = git@gitlab.com:johncosta027/tauri-plugin-sharetarget.git diff --git a/frontend/bun.lock b/frontend/bun.lock index a68ac32..7d7c73a 100644 --- a/frontend/bun.lock +++ b/frontend/bun.lock @@ -24,7 +24,7 @@ "solidjs-markdown": "^0.2.0", "tailwind-scrollbar-hide": "^2.0.0", "tauri-plugin-ios-shared-token-api": "file:../tauri-plugin-ios-shared-token", - "tauri-plugin-sharetarget-api": "file:../tauri-plugin-sharetarget", + "tauri-plugin-sharetarget-api": "^0.1.6", "valibot": "^1.0.0-rc.2", }, "devDependencies": { @@ -701,7 +701,7 @@ "tauri-plugin-ios-shared-token-api": ["tauri-plugin-ios-shared-token-api@file:../tauri-plugin-ios-shared-token", { "dependencies": { "@tauri-apps/api": ">=2.0.0-beta.6" }, "devDependencies": { "@rollup/plugin-typescript": "^11.1.6", "rollup": "^4.9.6", "tslib": "^2.6.2", "typescript": "^5.3.3" } }], - "tauri-plugin-sharetarget-api": ["tauri-plugin-sharetarget-api@file:../tauri-plugin-sharetarget", { "dependencies": { "@tauri-apps/api": ">=2.0.0-beta.6" }, "devDependencies": { "@rollup/plugin-typescript": "^11.1.6", "@tauri-apps/cli": "^2.0.4", "rollup": "^4.24.2", "tslib": "^2.6.2", "typescript": "^5.3.3" } }], + "tauri-plugin-sharetarget-api": ["tauri-plugin-sharetarget-api@0.1.6", "", { "dependencies": { "@tauri-apps/api": ">=2.0.0-beta.6" } }, "sha512-R9LgXu7hn8LaCW5ll8tJ4es0N2nCNVnptT4v3HTXInDra9pm5CuXalX3m5W7+/XTwOFn0sMRv4eOKz8S5FEy1w=="], "thenby": ["thenby@1.3.4", "", {}, "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ=="], diff --git a/frontend/package.json b/frontend/package.json index 2f8d555..b9ea825 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -34,7 +34,7 @@ "solidjs-markdown": "^0.2.0", "tailwind-scrollbar-hide": "^2.0.0", "tauri-plugin-ios-shared-token-api": "file:../tauri-plugin-ios-shared-token", - "tauri-plugin-sharetarget-api": "file:../tauri-plugin-sharetarget", + "tauri-plugin-sharetarget-api": "^0.1.6", "valibot": "^1.0.0-rc.2" }, "devDependencies": { diff --git a/frontend/src-tauri/Cargo.lock b/frontend/src-tauri/Cargo.lock index 43fd354..68d1eb7 100644 --- a/frontend/src-tauri/Cargo.lock +++ b/frontend/src-tauri/Cargo.lock @@ -4167,6 +4167,8 @@ dependencies = [ [[package]] name = "tauri-plugin-sharetarget" version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a6e4638b6a5492a46847fc9e994df8cfd2dbc1bacc11f15c207d6a2163c341" dependencies = [ "serde", "serde_json", diff --git a/frontend/src-tauri/Cargo.toml b/frontend/src-tauri/Cargo.toml index 46a052b..bf5941f 100644 --- a/frontend/src-tauri/Cargo.toml +++ b/frontend/src-tauri/Cargo.toml @@ -38,8 +38,8 @@ cocoa = "0.26" [target."cfg(any(target_os = \"macos\", target_os = \"linux\", target_os = \"windows\"))".dependencies] tauri-plugin-global-shortcut = "2" -[target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies] -tauri-plugin-sharetarget = { path = "../../tauri-plugin-sharetarget"} +[target."cfg(target_os = \"android\")".dependencies] +tauri-plugin-sharetarget = "0.1.6" [target."cfg(any(target_os = \"ios\"))".dependencies] tauri-plugin-ios-shared-token = { path = "../../tauri-plugin-ios-shared-token"} diff --git a/frontend/src-tauri/capabilities/ios.toml b/frontend/src-tauri/capabilities/ios.toml new file mode 100644 index 0000000..15333af --- /dev/null +++ b/frontend/src-tauri/capabilities/ios.toml @@ -0,0 +1,8 @@ +identifier = "iOS" +description = "Capabilities for iOS platforms" +windows = ["main"] +platforms = ["iOS"] + +permissions = [ + "ios-shared-token:default" +] diff --git a/frontend/src-tauri/capabilities/mobile.toml b/frontend/src-tauri/capabilities/mobile.toml index c0594ef..5851392 100644 --- a/frontend/src-tauri/capabilities/mobile.toml +++ b/frontend/src-tauri/capabilities/mobile.toml @@ -9,7 +9,6 @@ permissions = [ "http:default", "os:default", "sharetarget:default", - "ios-shared-token:default", { identifier = "http:default", allow = [ { url = "https://haystack.johncosta.tech" }, { url = "http://localhost:3040" }, diff --git a/frontend/src-tauri/src/lib.rs b/frontend/src-tauri/src/lib.rs index 5c2eead..f39dce4 100644 --- a/frontend/src-tauri/src/lib.rs +++ b/frontend/src-tauri/src/lib.rs @@ -20,12 +20,13 @@ use window::setup_window; pub fn desktop() { let watcher_state = new_shared_watcher_state(); - tauri::Builder::default() + let bruh = tauri::Builder::default() .plugin(tauri_plugin_os::init()) .plugin(tauri_plugin_log::Builder::new().build()) .plugin(tauri_plugin_fs::init()) - .plugin(tauri_plugin_store::Builder::new().build()) - .plugin(tauri_plugin_http::init()) + .plugin(tauri_plugin_store::Builder::new().build()); + + bruh.plugin(tauri_plugin_http::init()) .manage(watcher_state) .invoke_handler(tauri::generate_handler![ commands::handle_selected_folder, @@ -50,13 +51,17 @@ pub fn desktop() { #[cfg_attr(mobile, tauri::mobile_entry_point)] #[cfg(any(target_os = "ios", target_os = "android"))] pub fn android() { - tauri::Builder::default() + let common_builder = tauri::Builder::default() .plugin(tauri_plugin_os::init()) .plugin(tauri_plugin_fs::init()) .plugin(tauri_plugin_store::Builder::new().build()) .plugin(tauri_plugin_http::init()) - .plugin(tauri_plugin_sharetarget::init()) - .plugin(tauri_plugin_ios_shared_token::init()) + .plugin(tauri_plugin_sharetarget::init()); + + #[cfg(any(target_os = "ios"))] + common_builder.plugin(tauri_plugin_ios_shared_token::init()); + + common_builder .setup(|app| { log::info!("running things!"); setup_window(app)?; diff --git a/tauri-plugin-sharetarget b/tauri-plugin-sharetarget deleted file mode 160000 index c0d8712..0000000 --- a/tauri-plugin-sharetarget +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c0d871280be2922f940d8dc41cc85eeaab6f2ad9