try android build

This commit is contained in:
2025-05-28 17:27:25 +02:00
parent 4774d3fdc1
commit ceb5f43f15
10 changed files with 68 additions and 24 deletions

View File

@ -88,9 +88,13 @@ export default defineNuxtConfig({
// Enable SSG // Enable SSG
ssr: false, ssr: false,
// Enables the development server to be discoverable by other devices when running on iOS physical devices // Enables the development server to be discoverable by other devices when running on iOS physical devices
devServer: { host: process.env.TAURI_DEV_HOST || 'localhost', port: 3003 }, devServer: {
host: process.env.TAURI_DEV_HOST || '0.0.0.0',
},
vite: { vite: {
base: './',
plugins: [tailwindcss()], plugins: [tailwindcss()],
// Better support for Tauri CLI output // Better support for Tauri CLI output
clearScreen: false, clearScreen: false,
@ -103,4 +107,4 @@ export default defineNuxtConfig({
strictPort: true, strictPort: true,
}, },
}, },
}) })

View File

@ -1,2 +0,0 @@
DATABASE_URL=sqlite:database/vault.db
SQLX_OFFLINE=true

31
src-tauri/Cargo.lock generated
View File

@ -2124,11 +2124,12 @@ dependencies = [
[[package]] [[package]]
name = "libsqlite3-sys" name = "libsqlite3-sys"
version = "0.33.0" version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "947e6816f7825b2b45027c2c32e7085da9934defa535de4a6a46b10a4d5257fa" checksum = "91632f3b4fb6bd1d72aa3d78f41ffecfcf2b1a6648d8c241dbe7dbfaf4875e15"
dependencies = [ dependencies = [
"cc", "cc",
"openssl-sys",
"pkg-config", "pkg-config",
"vcpkg", "vcpkg",
] ]
@ -2602,6 +2603,28 @@ dependencies = [
"pathdiff", "pathdiff",
] ]
[[package]]
name = "openssl-src"
version = "300.5.0+3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f"
dependencies = [
"cc",
]
[[package]]
name = "openssl-sys"
version = "0.9.108"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
dependencies = [
"cc",
"libc",
"openssl-src",
"pkg-config",
"vcpkg",
]
[[package]] [[package]]
name = "option-ext" name = "option-ext"
version = "0.2.0" version = "0.2.0"
@ -3367,9 +3390,9 @@ dependencies = [
[[package]] [[package]]
name = "rusqlite" name = "rusqlite"
version = "0.35.0" version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a22715a5d6deef63c637207afbe68d0c72c3f8d0022d7cf9714c442d6157606b" checksum = "3de23c3319433716cf134eed225fe9986bc24f63bed9be9f20c329029e672dc7"
dependencies = [ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
"fallible-iterator", "fallible-iterator",

View File

@ -18,12 +18,11 @@ crate-type = ["staticlib", "cdylib", "rlib"]
tauri-build = { version = "2.2", features = [] } tauri-build = { version = "2.2", features = [] }
[dependencies] [dependencies]
rusqlite = { version = "0.35.0", features = [ rusqlite = { version = "0.36.0", features = [
"load_extension", "load_extension",
"bundled-sqlcipher" "bundled-sqlcipher-vendored-openssl"
] } ] }
#"bundled-sqlcipher" #libsqlite3-sys = { version = "0.31", features = ["bundled-sqlcipher"] }
#libsqlite3-sys = { version = "0.33", features = ["bundled-sqlcipher"] }
#sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "sqlite"] } #sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "sqlite"] }
tokio = { version = "1.45", features = ["macros", "rt-multi-thread"] } tokio = { version = "1.45", features = ["macros", "rt-multi-thread"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }

View File

@ -1,3 +1,13 @@
package space.haex.hub package space.haex.hub
import android.webkit.WebView
import android.os.Bundle
import android.content.pm.ApplicationInfo
class MainActivity : TauriActivity() class MainActivity : TauriActivity(){
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
if (0!= (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE)) {
WebView.setWebContentsDebuggingEnabled(true)
}
}
}

View File

@ -4,7 +4,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:8.5.1") classpath("com.android.tools.build:gradle:8.10.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
} }
} }

View File

@ -18,6 +18,6 @@ repositories {
dependencies { dependencies {
compileOnly(gradleApi()) compileOnly(gradleApi())
implementation("com.android.tools.build:gradle:8.5.1") implementation("com.android.tools.build:gradle:8.10.0")
} }

View File

@ -1,6 +1,6 @@
#Tue May 10 19:22:52 CST 2022 #Tue May 10 19:22:52 CST 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

View File

@ -5,7 +5,7 @@
"identifier": "space.haex.hub", "identifier": "space.haex.hub",
"build": { "build": {
"beforeDevCommand": "pnpm dev", "beforeDevCommand": "pnpm dev",
"devUrl": "http://localhost:3003", "devUrl": "http://0.0.0.0:3001",
"beforeBuildCommand": "pnpm generate", "beforeBuildCommand": "pnpm generate",
"frontendDist": "../.output/public" "frontendDist": "../.output/public"
}, },
@ -19,14 +19,24 @@
], ],
"security": { "security": {
"csp": { "csp": {
"default-src": ["'self'", "ipc: http://ipc.localhost", "blob:"], "default-src": ["'self'", "http://tauri.localhost"],
"media-src": [ "script-src": [
"'self'", "'self'",
"asset:", "http://tauri.localhost",
"http://asset.localhost", "'wasm-unsafe-eval'"
"blob:", ],
"asset: http://asset.localhost" "style-src": ["'self'", "http://tauri.localhost", "'unsafe-inline'"],
] "connect-src": [
"'self'",
"http://tauri.localhost",
"ipc:http://ipc.localhost"
],
"img-src": ["'self'", "http://tauri.localhost", "data:", "blob:"],
"font-src": ["'self'", "http://tauri.localhost"],
"object-src": ["'none'"],
"media-src": ["'self'", "http://tauri.localhost"],
"frame-src": ["'none'"],
"frame-ancestors": ["'none'"]
}, },
"assetProtocol": { "assetProtocol": {
"enable": true, "enable": true,