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

fix: update version to 4.11.66 and streamline Android build scripts
2026-04-15 22:14:24 +10:00 · 2026-04-15 22:14:14 +10:00
3 changed files with 10 additions and 11 deletions
--- a/2
+++ b/2
--- a/package.json
+++ b/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:patch-settings:linux": "sed -i 's|../node_modules/|../cinny/node_modules/|g' android/capacitor.settings.gradle",
-    "android:restore": "node scripts/restore-cinny.mjs",
+    "android:prepare": "node -e \"require('fs').copyFileSync('config.json', 'cinny/config.json')\" && cd cinny && npm run build && npx cap sync android",
    "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: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 && cd ../.. && node scripts/restore-cinny.mjs",
-    "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"
+    "android:apk": "npm run android:prepare && cd cinny/android && gradlew.bat assembleDebug",
+    "android:apk:release": "npm run android:prepare && cd cinny/android && gradlew.bat assembleRelease",
+    "android:aab": "npm run android:prepare && cd cinny/android && gradlew.bat bundleRelease"
  },
  "keywords": [],
  "author": {
Author	SHA1	Message	Date
Max Litruv Boonzaayer	3fe00eb3d7	Merge branch 'master' of http://synbox.ruv.wtf:8418/litruv/cinny-mobile Some checks failed Build / increment-version (push) Successful in 7s Details Build / build-and-release (push) Failing after 51s Details	2026-04-15 22:14:24 +10:00
Max Litruv Boonzaayer	85851d7288	fix: update version to 4.11.66 and streamline Android build scripts	2026-04-15 22:14:14 +10:00