chore: removing submodule of forked version of sharetarget

This commit is contained in:
2025-05-03 13:00:22 +01:00
parent e9617f86ec
commit 92e346578a
9 changed files with 26 additions and 16 deletions

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "tauri-plugin-sharetarget"]
path = tauri-plugin-sharetarget
url = git@gitlab.com:johncosta027/tauri-plugin-sharetarget.git

View File

@ -24,7 +24,7 @@
"solidjs-markdown": "^0.2.0", "solidjs-markdown": "^0.2.0",
"tailwind-scrollbar-hide": "^2.0.0", "tailwind-scrollbar-hide": "^2.0.0",
"tauri-plugin-ios-shared-token-api": "file:../tauri-plugin-ios-shared-token", "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", "valibot": "^1.0.0-rc.2",
}, },
"devDependencies": { "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-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=="], "thenby": ["thenby@1.3.4", "", {}, "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ=="],

View File

@ -34,7 +34,7 @@
"solidjs-markdown": "^0.2.0", "solidjs-markdown": "^0.2.0",
"tailwind-scrollbar-hide": "^2.0.0", "tailwind-scrollbar-hide": "^2.0.0",
"tauri-plugin-ios-shared-token-api": "file:../tauri-plugin-ios-shared-token", "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" "valibot": "^1.0.0-rc.2"
}, },
"devDependencies": { "devDependencies": {

View File

@ -4167,6 +4167,8 @@ dependencies = [
[[package]] [[package]]
name = "tauri-plugin-sharetarget" name = "tauri-plugin-sharetarget"
version = "0.1.6" version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15a6e4638b6a5492a46847fc9e994df8cfd2dbc1bacc11f15c207d6a2163c341"
dependencies = [ dependencies = [
"serde", "serde",
"serde_json", "serde_json",

View File

@ -38,8 +38,8 @@ cocoa = "0.26"
[target."cfg(any(target_os = \"macos\", target_os = \"linux\", target_os = \"windows\"))".dependencies] [target."cfg(any(target_os = \"macos\", target_os = \"linux\", target_os = \"windows\"))".dependencies]
tauri-plugin-global-shortcut = "2" tauri-plugin-global-shortcut = "2"
[target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies] [target."cfg(target_os = \"android\")".dependencies]
tauri-plugin-sharetarget = { path = "../../tauri-plugin-sharetarget"} tauri-plugin-sharetarget = "0.1.6"
[target."cfg(any(target_os = \"ios\"))".dependencies] [target."cfg(any(target_os = \"ios\"))".dependencies]
tauri-plugin-ios-shared-token = { path = "../../tauri-plugin-ios-shared-token"} tauri-plugin-ios-shared-token = { path = "../../tauri-plugin-ios-shared-token"}

View File

@ -0,0 +1,8 @@
identifier = "iOS"
description = "Capabilities for iOS platforms"
windows = ["main"]
platforms = ["iOS"]
permissions = [
"ios-shared-token:default"
]

View File

@ -9,7 +9,6 @@ permissions = [
"http:default", "http:default",
"os:default", "os:default",
"sharetarget:default", "sharetarget:default",
"ios-shared-token:default",
{ identifier = "http:default", allow = [ { identifier = "http:default", allow = [
{ url = "https://haystack.johncosta.tech" }, { url = "https://haystack.johncosta.tech" },
{ url = "http://localhost:3040" }, { url = "http://localhost:3040" },

View File

@ -20,12 +20,13 @@ use window::setup_window;
pub fn desktop() { pub fn desktop() {
let watcher_state = new_shared_watcher_state(); let watcher_state = new_shared_watcher_state();
tauri::Builder::default() let bruh = tauri::Builder::default()
.plugin(tauri_plugin_os::init()) .plugin(tauri_plugin_os::init())
.plugin(tauri_plugin_log::Builder::new().build()) .plugin(tauri_plugin_log::Builder::new().build())
.plugin(tauri_plugin_fs::init()) .plugin(tauri_plugin_fs::init())
.plugin(tauri_plugin_store::Builder::new().build()) .plugin(tauri_plugin_store::Builder::new().build());
.plugin(tauri_plugin_http::init())
bruh.plugin(tauri_plugin_http::init())
.manage(watcher_state) .manage(watcher_state)
.invoke_handler(tauri::generate_handler![ .invoke_handler(tauri::generate_handler![
commands::handle_selected_folder, commands::handle_selected_folder,
@ -50,13 +51,17 @@ pub fn desktop() {
#[cfg_attr(mobile, tauri::mobile_entry_point)] #[cfg_attr(mobile, tauri::mobile_entry_point)]
#[cfg(any(target_os = "ios", target_os = "android"))] #[cfg(any(target_os = "ios", target_os = "android"))]
pub fn android() { pub fn android() {
tauri::Builder::default() let common_builder = tauri::Builder::default()
.plugin(tauri_plugin_os::init()) .plugin(tauri_plugin_os::init())
.plugin(tauri_plugin_fs::init()) .plugin(tauri_plugin_fs::init())
.plugin(tauri_plugin_store::Builder::new().build()) .plugin(tauri_plugin_store::Builder::new().build())
.plugin(tauri_plugin_http::init()) .plugin(tauri_plugin_http::init())
.plugin(tauri_plugin_sharetarget::init()) .plugin(tauri_plugin_sharetarget::init());
.plugin(tauri_plugin_ios_shared_token::init())
#[cfg(any(target_os = "ios"))]
common_builder.plugin(tauri_plugin_ios_shared_token::init());
common_builder
.setup(|app| { .setup(|app| {
log::info!("running things!"); log::info!("running things!");
setup_window(app)?; setup_window(app)?;