diff --git a/.gitignore b/.gitignore index b14ef38..6b05c8e 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ pnpm-debug.log* /blob-report/ /playwright/.cache/ /dist-electron-build/ +/dist-capacitor/ \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 85a5dda..9a45d8f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath 'com.android.tools.build:gradle:8.7.3' classpath 'com.google.gms:google-services:4.4.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index c747538..dedd5d1 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/capacitor.config.ts b/capacitor.config.ts index 4fb30ef..3f836db 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -5,6 +5,9 @@ const config: CapacitorConfig = { appName: 'TimeSafari', webDir: 'dist', bundledWebRuntime: false, + server: { + cleartext: true, + }, }; export default config; diff --git a/vite.config.mjs b/vite.config.mjs index 03578c2..6fc30af 100644 --- a/vite.config.mjs +++ b/vite.config.mjs @@ -18,11 +18,11 @@ export default defineConfig(({ mode }) => { const outDir = isElectron ? "dist-electron" : isCapacitor - ? "dist-capacitor" - : "dist"; + ? "dist-capacitor" + : "dist"; return { - base: isElectron ? './' : '/', + base: isElectron ? "./" : "/", server: { port: process.env.VITE_PORT || 8080, }, diff --git a/vite.config.utils.js b/vite.config.utils.js index 8077348..201b63a 100644 --- a/vite.config.utils.js +++ b/vite.config.utils.js @@ -54,7 +54,7 @@ export async function loadAppConfig() { }, }, aliasConfig: { - "@": path.resolve(__dirname, "src"), + "@": path.resolve(__dirname, ".."), buffer: path.resolve(__dirname, "node_modules", "buffer"), "dexie-export-import/dist/import": "dexie-export-import/dist/import/index.js",