Skip to content

Commit

Permalink
Migrated to Android
Browse files Browse the repository at this point in the history
  • Loading branch information
alvinosh committed Jun 19, 2024
1 parent f17bcb3 commit eea77c4
Show file tree
Hide file tree
Showing 61 changed files with 11,426 additions and 777 deletions.
1,720 changes: 1,212 additions & 508 deletions Cargo.lock

Large diffs are not rendered by default.

126 changes: 77 additions & 49 deletions package-lock.json

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

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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.0-beta.20",
"@types/eslint": "^8.56.10",
"@types/qrcode": "^1.5.5",
"@typescript-eslint/eslint-plugin": "^7.11.0",
Expand All @@ -26,6 +26,7 @@
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-svelte": "^2.39.0",
"local-ip-url": "^1.0.10",
"postcss": "^8.4.38",
"prettier": "^3.2.5",
"prettier-plugin-svelte": "^3.2.3",
Expand All @@ -39,7 +40,9 @@
},
"type": "module",
"dependencies": {
"@tauri-apps/api": "^1.5.6",
"@tauri-apps/api": "^2.0.0-beta.13",
"@tauri-apps/plugin-barcode-scanner": "^2.0.0-beta.5",
"@tauri-apps/plugin-dialog": "^2.0.0-beta.5",
"qr-scanner": "^1.4.2",
"qrcode": "^1.5.3"
}
Expand Down
4 changes: 4 additions & 0 deletions src-tauri/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[build]
target = "x86_64-pc-windows-msvc"

[target]
9 changes: 7 additions & 2 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@ default-run = "ark-drop"
edition = "2021"
rust-version = "1.60"

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

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[build-dependencies]
tauri-build = { version = "1.5.2", features = [] }
tauri-build = { version = "2.0.0-beta", features = [] }

[dependencies]
drop_core = { path = "../core" }
tauri = { version = "1.6.7", features = ["dialog-open"] }
tauri = { version = "2.0.0-beta", features = [] }
hex = "0.4.3"
walkdir = "2.5.0"
flume = "0.11.0"
Expand All @@ -38,6 +42,7 @@ tokio = { workspace = true , features = ["full"] }
tokio-util = { workspace = true }
futures-lite = { workspace = true }
futures-buffered = { workspace = true }
tauri-plugin-dialog = "2.0.0-beta.9"



Expand Down
2 changes: 1 addition & 1 deletion src-tauri/build.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fn main() {
tauri_build::build()
tauri_build::build()
}
17 changes: 17 additions & 0 deletions src-tauri/capabilities/migrated.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"identifier": "migrated",
"description": "permissions that were migrated from v1",
"local": true,
"windows": ["main"],
"permissions": [
"path:default",
"event:default",
"window:default",
"app:default",
"resources:default",
"menu:default",
"tray:default",
"dialog:allow-open",
"dialog:default"
]
}
12 changes: 12 additions & 0 deletions src-tauri/gen/android/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = false
19 changes: 19 additions & 0 deletions src-tauri/gen/android/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
build
/captures
.externalNativeBuild
.cxx
local.properties
key.properties

/.tauri
/tauri.settings.gradle
6 changes: 6 additions & 0 deletions src-tauri/gen/android/app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/src/main/java/dev/arkbuilders/drop/generated
/src/main/jniLibs/**/*.so
/src/main/assets/tauri.conf.json
/tauri.build.gradle.kts
/proguard-tauri.pro
/tauri.properties
Loading

0 comments on commit eea77c4

Please sign in to comment.