@akanjs/cli 2.4.0-rc.5 → 2.4.0-rc.7

package/incrementalBuilder.proc.js

@@ -1048,7 +1048,7 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
     return this.#getMissingDependencySpecs(this.getDatabaseModeRuntimePackages(databaseMode));
   }
   getMobileRuntimePackages() {
-    return [...MOBILE_RUNTIME_PACKAGES];
+    return [...new Set([...MOBILE_RUNTIME_PACKAGES, ...MOBILE_APP_CAPACITOR_PLUGINS])];
   }
   getMissingMobileDependencySpecs() {
     return this.#getMissingDependencySpecs(this.getMobileRuntimePackages());
@@ -14198,7 +14198,7 @@ function parseSimctlDevices(output) {
   try {
     const json = JSON.parse(output);
     const devices = json.devices ?? {};
-    return Object.values(devices).flatMap((runtimeDevices) => runtimeDevices).filter(isRecord2).flatMap((device) => {
+    return Object.values(devices).flat().filter(isRecord2).flatMap((device) => {
       const id = firstString(device.udid, device.UDID, device.identifier);
       const name = firstString(device.name, device.displayName);
       const isAvailable = device.isAvailable !== false && device.availabilityError === undefined;
@@ -14376,6 +14376,16 @@ function getAdbDeviceStateIssues(output) {
     return [];
   });
 }
+var ANDROID_MIN_SDK_VERSION = 26;
+function raiseGradleMinSdkVersion(content, floor = ANDROID_MIN_SDK_VERSION) {
+  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}`);
+}
 var mergeAllowNavigation = (configured, localIp) => {
   const values = Array.isArray(configured) ? configured.filter((value) => typeof value === "string") : [];
   if (localIp)
@@ -14692,6 +14702,7 @@ ${error.message}`;
     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();
@@ -14907,6 +14918,16 @@ ${error.message}`;
     await this.project.android.setVersionCode(this.target.buildNum);
     await this.project.android.setAppName(this.target.appName);
   }
+  async#applyAndroidMinSdkVersion() {
+    const variablesGradlePath = path42.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 writeFile3(variablesGradlePath, updated);
+    this.app.verbose(`Raised Android minSdkVersion to ${ANDROID_MIN_SDK_VERSION} in variables.gradle`);
+  }
   async#applyPermissions({ operation, env }) {
     const plugins = await this.app.collectPlugins();
     const nativePlugins = new Map;

package/index.js

@@ -1046,7 +1046,7 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
     return this.#getMissingDependencySpecs(this.getDatabaseModeRuntimePackages(databaseMode));
   }
   getMobileRuntimePackages() {
-    return [...MOBILE_RUNTIME_PACKAGES];
+    return [...new Set([...MOBILE_RUNTIME_PACKAGES, ...MOBILE_APP_CAPACITOR_PLUGINS])];
   }
   getMissingMobileDependencySpecs() {
     return this.#getMissingDependencySpecs(this.getMobileRuntimePackages());
@@ -14196,7 +14196,7 @@ function parseSimctlDevices(output) {
   try {
     const json = JSON.parse(output);
     const devices = json.devices ?? {};
-    return Object.values(devices).flatMap((runtimeDevices) => runtimeDevices).filter(isRecord2).flatMap((device) => {
+    return Object.values(devices).flat().filter(isRecord2).flatMap((device) => {
       const id = firstString(device.udid, device.UDID, device.identifier);
       const name = firstString(device.name, device.displayName);
       const isAvailable = device.isAvailable !== false && device.availabilityError === undefined;
@@ -14374,6 +14374,16 @@ function getAdbDeviceStateIssues(output) {
     return [];
   });
 }
+var ANDROID_MIN_SDK_VERSION = 26;
+function raiseGradleMinSdkVersion(content, floor = ANDROID_MIN_SDK_VERSION) {
+  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}`);
+}
 var mergeAllowNavigation = (configured, localIp) => {
   const values = Array.isArray(configured) ? configured.filter((value) => typeof value === "string") : [];
   if (localIp)
@@ -14690,6 +14700,7 @@ ${error.message}`;
     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();
@@ -14905,6 +14916,16 @@ ${error.message}`;
     await this.project.android.setVersionCode(this.target.buildNum);
     await this.project.android.setAppName(this.target.appName);
   }
+  async#applyAndroidMinSdkVersion() {
+    const variablesGradlePath = path42.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 writeFile3(variablesGradlePath, updated);
+    this.app.verbose(`Raised Android minSdkVersion to ${ANDROID_MIN_SDK_VERSION} in variables.gradle`);
+  }
   async#applyPermissions({ operation, env }) {
     const plugins = await this.app.collectPlugins();
     const nativePlugins = new Map;

package/package.json

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