From ceb5f43f150829ab4a0beb9028fe6a60c53a5224 Mon Sep 17 00:00:00 2001 From: haex Date: Wed, 28 May 2025 17:27:25 +0200 Subject: [PATCH] try android build --- nuxt.config.ts | 8 +++-- src-tauri/.env | 2 -- src-tauri/Cargo.lock | 31 +++++++++++++++--- src-tauri/Cargo.toml | 7 ++-- .../app/src/main/assets/resources/vault.db | Bin 0 -> 49152 bytes .../main/java/space/haex/hub/MainActivity.kt | 12 ++++++- src-tauri/gen/android/build.gradle.kts | 2 +- .../gen/android/buildSrc/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- src-tauri/tauri.conf.json | 26 ++++++++++----- 10 files changed, 68 insertions(+), 24 deletions(-) delete mode 100644 src-tauri/.env create mode 100644 src-tauri/gen/android/app/src/main/assets/resources/vault.db diff --git a/nuxt.config.ts b/nuxt.config.ts index 9cee986..6eb590c 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -88,9 +88,13 @@ export default defineNuxtConfig({ // Enable SSG ssr: false, // 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: { + base: './', + plugins: [tailwindcss()], // Better support for Tauri CLI output clearScreen: false, @@ -103,4 +107,4 @@ export default defineNuxtConfig({ strictPort: true, }, }, -}) \ No newline at end of file +}) diff --git a/src-tauri/.env b/src-tauri/.env deleted file mode 100644 index 8889ab2..0000000 --- a/src-tauri/.env +++ /dev/null @@ -1,2 +0,0 @@ -DATABASE_URL=sqlite:database/vault.db -SQLX_OFFLINE=true \ No newline at end of file diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index e5134a3..6af8d92 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2124,11 +2124,12 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "947e6816f7825b2b45027c2c32e7085da9934defa535de4a6a46b10a4d5257fa" +checksum = "91632f3b4fb6bd1d72aa3d78f41ffecfcf2b1a6648d8c241dbe7dbfaf4875e15" dependencies = [ "cc", + "openssl-sys", "pkg-config", "vcpkg", ] @@ -2602,6 +2603,28 @@ dependencies = [ "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]] name = "option-ext" version = "0.2.0" @@ -3367,9 +3390,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a22715a5d6deef63c637207afbe68d0c72c3f8d0022d7cf9714c442d6157606b" +checksum = "3de23c3319433716cf134eed225fe9986bc24f63bed9be9f20c329029e672dc7" dependencies = [ "bitflags 2.9.0", "fallible-iterator", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index ce31575..fc151b6 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -18,12 +18,11 @@ crate-type = ["staticlib", "cdylib", "rlib"] tauri-build = { version = "2.2", features = [] } [dependencies] -rusqlite = { version = "0.35.0", features = [ +rusqlite = { version = "0.36.0", features = [ "load_extension", - "bundled-sqlcipher" + "bundled-sqlcipher-vendored-openssl" ] } - #"bundled-sqlcipher" -#libsqlite3-sys = { version = "0.33", features = ["bundled-sqlcipher"] } +#libsqlite3-sys = { version = "0.31", features = ["bundled-sqlcipher"] } #sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "sqlite"] } tokio = { version = "1.45", features = ["macros", "rt-multi-thread"] } serde = { version = "1", features = ["derive"] } diff --git a/src-tauri/gen/android/app/src/main/assets/resources/vault.db b/src-tauri/gen/android/app/src/main/assets/resources/vault.db new file mode 100644 index 0000000000000000000000000000000000000000..7dfe673ceed71ebe569fbfc12aef6cf108fedc1c GIT binary patch literal 49152 zcmeI&O>g5w7zc1WX_GiN%7(0pcve~N335CBU*E3^#?B_R+?OM*^ z!>Z>~(QS8{#1|Fr6^`e*_e7E7xEPyPhI3HPuz88iqlq6Cu35&ox6i*=6~5+#)H5!d z%zl%4cI&5=k5<3U+)sa*$)<0oZ(p-FRzUy)5P$##AOL}v6zJcNCv%&d{NTtf+ee0YwEce75F0aV8{(a`(D0mw=(8Tg2ld_k?fN5e&v+!( z4vxgyakaX|HXuF!wA~qO6x3-eI56AGYx(qqc7nDRY0~i)z0TRVa!xzJsSO&^TVlhr zN45N|6!**88sFazWASO%KMMMe3YqEikJ|s`nFsq1&m%8q5;GI8vi^H;ndU`e~%TeooGMbUhr{d|623_BUP>>eQi3d8(Sed?T64^H0%bn$9u2SJY&yL48 z+P^z_n%BrB=8XOPPHvb9(au2xVGab>XcS1)GL9!|3d0)J?jF>Q-Fvn0jxghr7wg7d zqi)nH#^H0KjXS|zB_CiPKiCOwK&`e&>>vw*wjHBtOtz)-$B9JFt6ZC*QA|^+!+f2; zGMW98`ysqn%JW8NW<>sb_saacONrdW&6~0eF5NN3a{nzpnbS1B-weYyO{e2MeR@XC zrgt*9CcE?6VpHk3K5vut;K?Bfo+BO__1*32LZgKmY;|fB*y_009U<00Izz zzyb>d-~aLczrX{G&>#Q-2tWV=5P$##AOHafKmYRF(QNj1Rwwb2tWV=5P$##AOHaf;QK#v00Izz00bZa0SG_<0uX=z1R${Z z0{H&F_+yL+ApijgKmY;|fB*y_009U<00Kh+o-H%bfB*y_009U<00Izz00bZa0SG`~ HF$Mks=swJS literal 0 HcmV?d00001 diff --git a/src-tauri/gen/android/app/src/main/java/space/haex/hub/MainActivity.kt b/src-tauri/gen/android/app/src/main/java/space/haex/hub/MainActivity.kt index cee843f..0af2838 100644 --- a/src-tauri/gen/android/app/src/main/java/space/haex/hub/MainActivity.kt +++ b/src-tauri/gen/android/app/src/main/java/space/haex/hub/MainActivity.kt @@ -1,3 +1,13 @@ package space.haex.hub +import android.webkit.WebView +import android.os.Bundle +import android.content.pm.ApplicationInfo -class MainActivity : TauriActivity() \ No newline at end of file +class MainActivity : TauriActivity(){ + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + if (0!= (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE)) { + WebView.setWebContentsDebuggingEnabled(true) + } + } +} \ No newline at end of file diff --git a/src-tauri/gen/android/build.gradle.kts b/src-tauri/gen/android/build.gradle.kts index c5ef452..ca48cb4 100644 --- a/src-tauri/gen/android/build.gradle.kts +++ b/src-tauri/gen/android/build.gradle.kts @@ -4,7 +4,7 @@ buildscript { mavenCentral() } 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") } } diff --git a/src-tauri/gen/android/buildSrc/build.gradle.kts b/src-tauri/gen/android/buildSrc/build.gradle.kts index 39e90b0..c4edbcd 100644 --- a/src-tauri/gen/android/buildSrc/build.gradle.kts +++ b/src-tauri/gen/android/buildSrc/build.gradle.kts @@ -18,6 +18,6 @@ repositories { dependencies { compileOnly(gradleApi()) - implementation("com.android.tools.build:gradle:8.5.1") + implementation("com.android.tools.build:gradle:8.10.0") } diff --git a/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties b/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties index 0df10d5..0d4bd19 100644 --- a/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties +++ b/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue May 10 19:22:52 CST 2022 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 zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index a564271..e0bc7e9 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -5,7 +5,7 @@ "identifier": "space.haex.hub", "build": { "beforeDevCommand": "pnpm dev", - "devUrl": "http://localhost:3003", + "devUrl": "http://0.0.0.0:3001", "beforeBuildCommand": "pnpm generate", "frontendDist": "../.output/public" }, @@ -19,14 +19,24 @@ ], "security": { "csp": { - "default-src": ["'self'", "ipc: http://ipc.localhost", "blob:"], - "media-src": [ + "default-src": ["'self'", "http://tauri.localhost"], + "script-src": [ "'self'", - "asset:", - "http://asset.localhost", - "blob:", - "asset: http://asset.localhost" - ] + "http://tauri.localhost", + "'wasm-unsafe-eval'" + ], + "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": { "enable": true,