@akanjs/devkit 2.4.0-rc.6 → 2.4.0-rc.7

package/capacitorApp.test.ts

@@ -4,6 +4,7 @@ import os from "node:os";
 import path from "node:path";
 import type { AkanMobileTargetConfig } from "./akanConfig";
 import {
+  ANDROID_MIN_SDK_VERSION,
   assertJsonSerializable,
   buildIosNativeRunCommand,
   classifyIosRunFailure,
@@ -14,6 +15,7 @@ import {
   materializeCapacitorConfig,
   parseDevicectlDevices,
   parseSimctlDevices,
+  raiseGradleMinSdkVersion,
   rootCapacitorConfigFilenames,
   sanitizeIosNativeRunEnv,
   writeRootCapacitorConfig,
@@ -255,3 +257,24 @@ describe("Android signing diagnostics", () => {
     ]);
   });
 });
+
+describe("raiseGradleMinSdkVersion", () => {
+  test("raises the scaffold minSdkVersion to the bundled-plugin floor, preserving formatting", () => {
+    const scaffold = "ext {\n    minSdkVersion = 24\n    compileSdkVersion = 35\n}\n";
+    expect(raiseGradleMinSdkVersion(scaffold)).toBe(
+      `ext {\n    minSdkVersion = ${ANDROID_MIN_SDK_VERSION}\n    compileSdkVersion = 35\n}\n`,
+    );
+  });
+
+  test("returns null when nothing needs changing", () => {
+    // Already at the floor, already above it, and no assignment present.
+    expect(raiseGradleMinSdkVersion(`ext {\n    minSdkVersion = ${ANDROID_MIN_SDK_VERSION}\n}\n`)).toBeNull();
+    expect(raiseGradleMinSdkVersion("ext {\n    minSdkVersion = 34\n}\n")).toBeNull();
+    expect(raiseGradleMinSdkVersion("ext {\n    compileSdkVersion = 35\n}\n")).toBeNull();
+  });
+
+  test("honors an explicit floor and leaves higher user values untouched", () => {
+    expect(raiseGradleMinSdkVersion("minSdkVersion = 21", 23)).toBe("minSdkVersion = 23");
+    expect(raiseGradleMinSdkVersion("minSdkVersion = 28", 26)).toBeNull();
+  });
+});

package/capacitorApp.ts

@@ -203,7 +203,7 @@ export function parseSimctlDevices(output: string): IosRunTarget[] {
     const json = JSON.parse(output) as { devices?: Record<string, unknown[]> };
     const devices = json.devices ?? {};
     return Object.values(devices)
-      .flatMap((runtimeDevices) => runtimeDevices)
+      .flat()
       .filter(isRecord)
       .flatMap((device) => {
         const id = firstString(device.udid, device.UDID, device.identifier);
@@ -424,6 +424,15 @@ export function getAdbDeviceStateIssues(output: string) {
     });
 }
 
+export const ANDROID_MIN_SDK_VERSION = 26;
+export function raiseGradleMinSdkVersion(content: string, floor: number = ANDROID_MIN_SDK_VERSION): string | null {
+  const match = content.match(/minSdkVersion\s*=\s*(\d+)/);
+  if (!match?.[1]) return null;
+  const current = Number.parseInt(match[1], 10);
+  if (Number.isNaN(current) || current >= floor) return null;
+  return content.replace(/(minSdkVersion\s*=\s*)\d+/, `$1${floor}`);
+}
+
 const mergeAllowNavigation = (configured: unknown, localIp: string | undefined) => {
   const values = Array.isArray(configured)
     ? configured.filter((value): value is string => typeof value === "string")
@@ -766,6 +775,7 @@ export class CapacitorApp {
     await this.#prepareTargetAssets();
     await this.#prepareExternalFiles("android");
     await this.#applyAndroidMetadata();
+    await this.#applyAndroidMinSdkVersion();
     await this.#applyPermissions({ operation, env });
     await this.#applyDeepLinks("android", { operation, env });
     await this.project.commit();
@@ -992,6 +1002,14 @@ export class CapacitorApp {
     await this.project.android.setVersionCode(this.target.buildNum);
     await this.project.android.setAppName(this.target.appName);
   }
+  async #applyAndroidMinSdkVersion() {
+    const variablesGradlePath = path.join(this.app.cwdPath, this.androidRootPath, "variables.gradle");
+    if (!(await Bun.file(variablesGradlePath).exists())) return;
+    const updated = raiseGradleMinSdkVersion(await Bun.file(variablesGradlePath).text());
+    if (!updated) return;
+    await writeFile(variablesGradlePath, updated);
+    this.app.verbose(`Raised Android minSdkVersion to ${ANDROID_MIN_SDK_VERSION} in variables.gradle`);
+  }
   async #applyPermissions({ operation, env }: Pick<RunConfig, "operation" | "env">) {
     const plugins = await this.app.collectPlugins();
     const nativePlugins = new Map<MobilePermission, AkanPlugin[]>();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "2.4.0-rc.6",
+  "version": "2.4.0-rc.7",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -32,7 +32,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.4.0-rc.6",
+    "akanjs": "2.4.0-rc.7",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "5.5.23",