Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tauri Migration from V1 -> V2 and functional android build #9

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,659 changes: 1,814 additions & 845 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ edition = "2021"

[lib]
name = "drop_core"
crate-type = ["cdylib", "lib"]
crate-type = ["staticlib", "cdylib", "rlib"]

[dependencies]
iroh = { workspace = true }
iroh = { workspace = true }
iroh-blobs = { workspace = true }
iroh-base = { workspace = true }
iroh-net = { workspace = true }
Expand Down
154 changes: 87 additions & 67 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"scripts": {
"uniffi:kotlin:debug": "cargo run -p uniffi-bingen generate --library ./target/debug/drop_core.dll --language=kotlin --out-dir ./bindings",
"tauri": "tauri",
"dev": "vite dev",
"dev": "vite dev --host",
"build": "vite build",
"preview": "vite preview",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
Expand All @@ -18,7 +18,7 @@
"@sveltejs/adapter-static": "^3.0.1",
"@sveltejs/kit": "^2.5.10",
"@sveltejs/vite-plugin-svelte": "^3.1.0",
"@tauri-apps/cli": "^1.5.14",
"@tauri-apps/cli": "^2.0.3",
"@types/eslint": "^8.56.10",
"@types/qrcode": "^1.5.5",
"@typescript-eslint/eslint-plugin": "^7.11.0",
Expand All @@ -40,8 +40,10 @@
},
"type": "module",
"dependencies": {
"@tauri-apps/api": "^1.5.6",
"qr-scanner": "^1.4.2",
"@tauri-apps/api": "^2.0.0",
"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
"@tauri-apps/plugin-dialog": "^2.0.0",
"html5-qrcode": "^2.3.8",
"qrcode": "^1.5.3"
}
}
4 changes: 4 additions & 0 deletions src-tauri/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Generated by Cargo
# will have compiled files and executables
/target/

# Generated by Tauri
# will have schema files for capabilities auto-completion
/gen/schemas
5 changes: 0 additions & 5 deletions src-tauri/.idea/.gitignore

This file was deleted.

8 changes: 0 additions & 8 deletions src-tauri/.idea/modules.xml

This file was deleted.

Loading
Loading