Merge branch 'master' of http://synbox.ruv.wtf:8418/litruv/cinny-mobile

package.json

@@ -1,22 +1,21 @@
 {
   "name": "paarrot",
+<<<<<<< HEAD
+  "version": "4.11.66",
+=======
   "version": "4.11.83",
+>>>>>>> 47f1b2c40f38dfeb985a1965fe4222614cdfcf23
   "description": "Paarrot - A Matrix client based on Cinny",
   "engines": {
     "node": ">=18.0.0"
   },
   "scripts": {
-    "android:prepare": "node scripts/apply-overlay.mjs && cd cinny && npm install && npm run build && npx cap sync android",
+    "android:prepare": "node -e \"require('fs').copyFileSync('config.json', 'cinny/config.json')\" && cd cinny && npm run build && npx cap sync android",
-    "android:patch-settings:linux": "sed -i 's|../node_modules/|../cinny/node_modules/|g' android/capacitor.settings.gradle",
-    "android:restore": "node scripts/restore-cinny.mjs",
     "android:open": "cd cinny && npx cap open android",
     "android:run": "cd cinny && npx cap run android",
-    "android:apk": "npm run android:prepare && cd cinny/android && gradlew.bat assembleDebug && cd ../.. && node scripts/restore-cinny.mjs",
+    "android:apk": "npm run android:prepare && cd cinny/android && gradlew.bat assembleDebug",
-    "android:apk:linux": "npm run android:prepare && npm run android:patch-settings:linux && cd cinny/android && ./gradlew assembleDebug && cd ../.. && node scripts/restore-cinny.mjs",
+    "android:apk:release": "npm run android:prepare && cd cinny/android && gradlew.bat assembleRelease",
-    "android:apk:release": "npm run android:prepare && cd cinny/android && gradlew.bat assembleRelease && cd ../.. && node scripts/restore-cinny.mjs",
+    "android:aab": "npm run android:prepare && cd cinny/android && gradlew.bat bundleRelease"
-    "android:apk:release:linux": "npm run android:prepare && npm run android:patch-settings:linux && cd cinny/android && ./gradlew assembleRelease && cd ../.. && node scripts/restore-cinny.mjs",
-    "android:aab": "npm run android:prepare && cd cinny/android && gradlew.bat bundleRelease && cd ../.. && node scripts/restore-cinny.mjs",
-    "android:aab:linux": "npm run android:prepare && npm run android:patch-settings:linux && cd cinny/android && ./gradlew bundleRelease && cd ../.. && node scripts/restore-cinny.mjs"
   },
   "keywords": [],
   "author": {