diff --git a/package.json b/package.json index 2d4afe4b6..53921b894 100644 --- a/package.json +++ b/package.json @@ -44,14 +44,10 @@ "buildFrontend:prodWeb": "npm run prebuild && node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build --configuration productionWeb", "buildFrontend:stage:es6": "npm run prebuild && cross-env BROWSERSLIST_ENV='modern' ng build --configuration stage && npm run removeWOFF1", "buildFrontend:stageWeb": "npm run prebuild && ng build --configuration stageWeb", - "buildFrontend:stageCapacitorAndroid": "npm run prebuild && ng build --configuration stage --output-path=www", "buildFrontend:prod:watch": "npm run prebuild && ng build --configuration production --watch", - "buildFrontend:prodCapacitorAndroid": "npm run prebuild && ng build --configuration production --output-path=www", "buildAllElectron:prod": "npm run preCheck && npm run buildFrontend:prod:es6 && npm run electron:build", "buildAllElectron:stage": "npm run preCheck && npm run buildFrontend:stage:es6 && npm run electron:build", "buildAllElectron:noTests:prod": "npm run lint && npm run buildFrontend:prod:es6 && npm run electron:build", - "buildAllCapacitor:android:stage": "npm run buildFrontend:stageCapacitorAndroid && npm run sync:android && npm run assemble:android:stage", - "buildAllCapacitor:android:prod": "npm run buildFrontend:prodCapacitorAndroid && npm run sync:android && npm run assemble:android:prod", "build": "npm run buildAllElectron:noTests:prod", "sync:android": "npx cap sync android", "assemble:android:prod": "cd android && ./gradlew assembleRelease && cd ..", @@ -86,8 +82,8 @@ "dist:mac:mas:buildOnly": "electron-builder --config=build/electron-builder.mas.yaml", "dist:mac:mas:dev": "cp tools/mac-profiles/mas-dev.provisionprofile embedded.provisionprofile; electron-builder --mac mas-dev --config=build/electron-builder.mas-dev.yaml", "dist:mac:mas:x64": "cp tools/mac-profiles/mas.provisionprofile embedded.provisionprofile; electron-builder --mac mas --config=build/electron-builder.mas.yaml --x64", - "dist:android": "npm run buildAllCapacitor:android:stage && echo 'Staging Android APK generated at android/app/build/outputs/apk/debug/'", - "dist:android:prod": "npm run buildAllCapacitor:android:prod && echo 'Production Android APK generated at android/app/build/outputs/apk/release/'", + "dist:android": "npm run buildFrontend:stageWeb && npm run sync:android && npm run assemble:android:stage && echo 'Staging Android APK generated at android/app/build/outputs/apk/debug/'", + "dist:android:prod": "npm run buildFrontend:prodWeb && npm run sync:android && npm run assemble:android:prod && echo 'Production Android APK generated at android/app/build/outputs/apk/release/'", "release": "npm run release.changelog && npm run dist", "release.changelog": "conventional-changelog -i CHANGELOG.md -s -p angular", "version": "npm run prebuild && npm run release.changelog && git add -A",