Upload 3 files

Dockerfile

@@ -9,8 +9,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     wget unzip git python3 python3-pip curl ca-certificates \
     && rm -rf /var/lib/apt/lists/*
 
-# Node 20
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
+# Node 22 (Cap8 CLI requires Node 22+; npm 10 ships with it)
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
     apt-get install -y nodejs && node -v && npm -v
 
 # Extra JDKs for era coverage (11 = legacy AGP7, 21 = modern Cap7+/AGP9-era).

app.py

@@ -655,9 +655,9 @@ def _sanitize_app_config(cfg: dict | None) -> dict:
     version_name = str(cfg.get("versionName", "1.0")).strip() or "1.0"
     version_name = version_name[:20].replace('"', '').replace("'", "")
     version_code = _int(cfg.get("versionCode", 1), 1, 1, 2100000000)
-    # minSdk floor 22 = Capacitor merger requirement (android library declares 22;
+    # minSdk floor 24 = Cap8 merger requirement (android library declares 24;
     # anything lower fails manifest merge now that we write it for real — see 3f).
-    min_sdk = _int(cfg.get("minSdk", 22), 22, 22, 36)
+    min_sdk = _int(cfg.get("minSdk", 24), 24, 24, 36)
     target_sdk = _int(cfg.get("targetSdk", 36), 36, 16, 36)
     compile_sdk = _int(cfg.get("compileSdk", 36), 36, 16, 36)
     # ensure compile >= target >= min
@@ -876,18 +876,18 @@ def _patch_pure_web_android(android_dir: Path, cfg: dict, log_fn):
         # (app/build.gradle only references rootProject.ext.* with no bare digits,
         # so patching it alone silently no-ops — UI SDK choices never landed).
         # Generated wrapper only — user-owned projects never reach this function.
-        # minSdk floor 22 = Capacitor merger requirement (lower cannot build).
+        # minSdk floor 24 = Cap8 merger requirement (lower cannot build).
         try:
             vf = android_dir / "variables.gradle"
             if vf.exists():
                 vtxt = vf.read_text(encoding="utf-8", errors="ignore")
                 vorig = vtxt
-                vtxt = re.sub(r"minSdkVersion\s*=?\s*\d+", f"minSdkVersion = {max(22, cfg['minSdk'])}", vtxt)
+                vtxt = re.sub(r"minSdkVersion\s*=?\s*\d+", f"minSdkVersion = {max(24, cfg['minSdk'])}", vtxt)
                 vtxt = re.sub(r"targetSdkVersion\s*=?\s*\d+", f"targetSdkVersion = {cfg['targetSdk']}", vtxt)
                 vtxt = re.sub(r"compileSdkVersion\s*=?\s*\d+", f"compileSdkVersion = {cfg['compileSdk']}", vtxt)
                 if vtxt != vorig:
                     vf.write_text(vtxt, encoding="utf-8")
-                    log_fn(f"Patched variables.gradle -> minSdk {max(22, cfg['minSdk'])} targetSdk {cfg['targetSdk']} compileSdk {cfg['compileSdk']}")
+                    log_fn(f"Patched variables.gradle -> minSdk {max(24, cfg['minSdk'])} targetSdk {cfg['targetSdk']} compileSdk {cfg['compileSdk']}")
         except Exception as e:
             log_fn(f"variables.gradle patch warning: {e}")
         # 4. AndroidManifest package fallback (older templates) - ensure package attr matches
@@ -1170,11 +1170,11 @@ async def run_build(job_id: str, build_id: str, task: str, signing: dict, app_co
                 "version": "1.0.0",
                 "private": True,
                 "dependencies": {
-                    "@capacitor/core": "^6.2.0",
-                    "@capacitor/android": "^6.2.0"
+                    "@capacitor/core": "^8.0.0",
+                    "@capacitor/android": "^8.0.0"
                 },
                 "devDependencies": {
-                    "@capacitor/cli": "^6.2.0"
+                    "@capacitor/cli": "^8.0.0"
                 }
             }
             pkg.write_text(json.dumps(pkg_data, indent=2))
@@ -1188,11 +1188,11 @@ async def run_build(job_id: str, build_id: str, task: str, signing: dict, app_co
                 else:
                     log("npm install done")
                 await asyncio.sleep(0)  # yield to WS loop
-                # Device kit (batched, Cap6 scaffold): folder picking + device save.
+                # Device kit (batched, Cap8 scaffold): folder picking + device save.
                 # Safe: work copy only, --no-save, single npm call, log-and-continue.
                 try:
                     from capacitor_plugins import ensure_device_kit, cli_bin_ok
-                    await ensure_device_kit(build_dir, 6, log, _run_cmd)
+                    await ensure_device_kit(build_dir, 8, log, _run_cmd)
                     if not cli_bin_ok(build_dir):
                         log("WARNING: Capacitor CLI binary missing after install — cap init may fail, check npm log above")
                 except Exception as e:
@@ -1316,12 +1316,16 @@ async def run_build(job_id: str, build_id: str, task: str, signing: dict, app_co
             await asyncio.sleep(0)
             # --- ensure Capacitor platform deps (work copy only, version-pinned to core major) ---
             try:
-                pin = cap_major if cap_major else 6
+                pin = cap_major if cap_major else 8
                 need = []
                 if not (work_base / "node_modules" / "@capacitor" / "cli").exists():
                     need.append(f"@capacitor/cli@{pin}")
                 if not (work_base / "node_modules" / "@capacitor" / "android").exists():
                     need.append(f"@capacitor/android@{pin}")
+                # core alongside cli/android so plugin peers resolve and bundler
+                # imports work; saved into the work copy (prune-safe, see note below).
+                if not (work_base / "node_modules" / "@capacitor" / "core").exists():
+                    need.append(f"@capacitor/core@{pin}")
                 if need:
                     log(f"Installing missing Capacitor packages: {' '.join(need)}")
                     # Saved (not --no-save) into the WORK-COPY package.json on purpose:
@@ -1402,11 +1406,11 @@ async def run_build(job_id: str, build_id: str, task: str, signing: dict, app_co
             # Work copy only, --no-save, log-and-continue; re-verifies CLI after.
             try:
                 from capacitor_plugins import ensure_device_kit as _edk
-                await _edk(work_base, cap_major if cap_major else 6, log, _run_cmd)
+                await _edk(work_base, cap_major if cap_major else 8, log, _run_cmd)
                 if not cli_bin_ok(work_base):
                     log("WARNING: CLI binary missing after device kit — reinstalling platform packages")
-                    _pin = cap_major if cap_major else 6
-                    await _run_cmd(["npm", "install", "--no-audit", "--no-fund", "--silent", f"@capacitor/cli@{_pin}", f"@capacitor/android@{_pin}"], cwd=work_base, timeout=300)
+                    _pin = cap_major if cap_major else 8
+                    await _run_cmd(["npm", "install", "--no-audit", "--no-fund", "--silent", f"@capacitor/cli@{_pin}", f"@capacitor/android@{_pin}", f"@capacitor/core@{_pin}"], cwd=work_base, timeout=300)
             except Exception as e:
                 log(f"Device kit note: {e}")
             try: