@invarn/cibuild 1.3.18 → 1.3.19

package/dist/src/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { resolve, extname } from "node:path";
 import { pathToFileURL } from "node:url";
-import { existsSync, readdirSync, mkdirSync, copyFileSync, readFileSync, writeFileSync, appendFileSync } from "node:fs";
+import { existsSync, readdirSync, mkdirSync, copyFileSync, readFileSync, writeFileSync, appendFileSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { execSync } from "node:child_process";
 import prompts from "prompts";
@@ -26,7 +26,7 @@ import { generateGitHubActionsWorkflow } from "./commands/github-workflow.js";
  * Returns the detected project type, or null if neither is found.
  */
 function detectMobileProjectRoot(dir) {
-    // Android: must have build.gradle or build.gradle.kts at root
+    // Android/KMM: must have build.gradle or build.gradle.kts at root
     const androidIndicators = [
         "build.gradle",
         "build.gradle.kts",
@@ -35,7 +35,22 @@ function detectMobileProjectRoot(dir) {
         "gradlew",
     ];
     const hasAndroidIndicator = androidIndicators.some((f) => existsSync(resolve(dir, f)));
+    // KMM: Gradle project with an iosApp/ directory or shared/ multiplatform module
+    // Must check before plain Android since KMM also has Gradle files
     if (hasAndroidIndicator) {
+        const kmmIndicators = ["iosApp", "shared", "composeApp"];
+        const hasKmmIndicator = kmmIndicators.some((d) => {
+            const fullPath = resolve(dir, d);
+            try {
+                return existsSync(fullPath) && statSync(fullPath).isDirectory();
+            }
+            catch {
+                return false;
+            }
+        });
+        if (hasKmmIndicator) {
+            return "kmm";
+        }
         return "android";
     }
     // iOS: must have a .xcodeproj or .xcworkspace directory, or a Podfile
@@ -88,9 +103,10 @@ async function handleInitCommand(opts = {}) {
     const projectType = detectMobileProjectRoot(cwd);
     if (!projectType) {
         console.error("Error: Not a mobile project root.");
-        console.error("ci init must be run from the root folder of an Android or iOS project.");
-        console.error("\nAndroid projects must contain one of:");
+        console.error("ci init must be run from the root folder of an Android, iOS, or KMM project.");
+        console.error("\nAndroid/KMM projects must contain one of:");
         console.error("  build.gradle, build.gradle.kts, settings.gradle, settings.gradle.kts, gradlew");
+        console.error("\nKMM projects additionally need: iosApp/, shared/, or composeApp/ directory");
         console.error("\niOS projects must contain one of:");
         console.error("  *.xcodeproj, *.xcworkspace, Podfile");
         process.exit(1);
@@ -104,7 +120,8 @@ async function handleInitCommand(opts = {}) {
             process.exit(1);
         }
     }
-    console.log(`\nDetected project type: ${projectType === "android" ? "Android" : "iOS"}`);
+    const projectTypeLabel = projectType === "kmm" ? "KMM (Kotlin Multiplatform)" : projectType === "android" ? "Android" : "iOS";
+    console.log(`\nDetected project type: ${projectTypeLabel}`);
     console.log(`
 ╔══════════════════════════════════════════════════════════════╗
 ║                 CI Build - Dependency Check                  ║

package/dist/src/commands/build.d.ts

@@ -1,4 +1,4 @@
-export declare function handleBuildCommand(detectMobileProjectRoot: (dir: string) => "android" | "ios" | null, options?: {
+export declare function handleBuildCommand(detectMobileProjectRoot: (dir: string) => "android" | "ios" | "kmm" | null, options?: {
     createPipelinesDir?: boolean;
     nonInteractive?: boolean;
 }): Promise<void>;

package/dist/src/commands/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/build.ts"],"names":[],"mappings":"AAw9BA,wBAAsB,kBAAkB,CACtC,uBAAuB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,SAAS,GAAG,KAAK,GAAG,IAAI,EAClE,OAAO,GAAE;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,GACvE,OAAO,CAAC,IAAI,CAAC,CAqRf"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/build.ts"],"names":[],"mappings":"AA+7BA,wBAAsB,kBAAkB,CACtC,uBAAuB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,IAAI,EAC1E,OAAO,GAAE;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,GACvE,OAAO,CAAC,IAAI,CAAC,CA4Bf"}

package/dist/src/commands/build.js

@@ -122,7 +122,7 @@ function detectSetupNeeds(warnings) {
         artifactType: 'apk',
     };
 }
-function generateAndroidPipeline(javaVersion = 17, setup = { keystore: false, keystoreProperties: false, googleServices: false, googlePlayDeploy: false, googlePlayPackageName: '', artifactType: 'apk', keystorePaths: {} }, variants = DEFAULT_VARIANTS) {
+function generateAndroidPipeline(javaVersion = 17, setup = { keystore: false, keystoreProperties: false, googleServices: false, googlePlayDeploy: false, googlePlayPackageName: '', artifactType: 'apk', keystorePaths: {} }, variants = DEFAULT_VARIANTS, cacheTechnology = "gradle") {
     const keystoreStepFor = (wf) => {
         if (!setup.keystore)
             return "";
@@ -227,11 +227,7 @@ ${keystoreStepFor("primary")}${googleServicesStep}
 
       - cache-pull@1.0.0:
           inputs:
-            cache_key: gradle-\$MODULE
-            cache_paths:
-              - ~/.gradle/caches
-              - ~/.gradle/wrapper
-              - .gradle
+            technology: ${cacheTechnology}
 
       - android-lint@1.0.0:
           is_skippable: true
@@ -257,11 +253,7 @@ ${keystoreStepFor("primary")}${googleServicesStep}
 
       - cache-push@1.0.0:
           inputs:
-            cache_key: gradle-\$MODULE
-            cache_paths:
-              - ~/.gradle/caches
-              - ~/.gradle/wrapper
-              - .gradle
+            technology: ${cacheTechnology}
 
   pull-request:
     envs:
@@ -275,10 +267,7 @@ ${keystoreStepFor("pull-request")}${googleServicesStep}
 
       - cache-pull@1.0.0:
           inputs:
-            cache_key: gradle-pr-\$MODULE
-            cache_paths:
-              - ~/.gradle/caches
-              - ~/.gradle/wrapper
+            technology: ${cacheTechnology}
 
       - android-lint@1.0.0:
           is_skippable: true
@@ -303,10 +292,7 @@ ${keystoreStepFor("pull-request")}${googleServicesStep}
 
       - cache-push@1.0.0:
           inputs:
-            cache_key: gradle-pr-\$MODULE
-            cache_paths:
-              - ~/.gradle/caches
-              - ~/.gradle/wrapper
+            technology: ${cacheTechnology}
 
   release:
     envs:
@@ -416,10 +402,8 @@ function generateIosPipeline(projectPath, setup, variants) {
             submit_for_review: 'no'
 `
         : "";
-    // Cache paths depend on whether CocoaPods is used
-    const cachePaths = setup.cocoaPods
-        ? `              - Pods\n              - Podfile.lock`
-        : `              - .build`;
+    // Cache technology depends on whether CocoaPods is used
+    const iosCacheTechnology = setup.cocoaPods ? "cocoapods" : "spm";
     return `format_version: '1'
 
 meta:
@@ -441,9 +425,7 @@ ${schemeEnvFor(pv.scheme)}${configEnvFor(pv.configuration)}
     steps:
       - cache-pull@1.0.0:
           inputs:
-            cache_key: pods-\$SCHEME
-            cache_paths:
-${cachePaths}
+            technology: ${iosCacheTechnology}
 ${podInstallStep}
       - xcode-archive@1.0.0:
           inputs:
@@ -463,9 +445,7 @@ ${podInstallStep}
 
       - cache-push@1.0.0:
           inputs:
-            cache_key: pods-\$SCHEME
-            cache_paths:
-${cachePaths}
+            technology: ${iosCacheTechnology}
 
   pull-request:
     envs:
@@ -473,9 +453,7 @@ ${schemeEnvFor(prv.scheme)}${configEnvFor(prv.configuration)}
     steps:
       - cache-pull@1.0.0:
           inputs:
-            cache_key: pods-pr-\$SCHEME
-            cache_paths:
-${cachePaths}
+            technology: ${iosCacheTechnology}
 ${podInstallStepPR}
       - xcode-test@1.0.0:
           is_skippable: true
@@ -493,9 +471,7 @@ ${podInstallStepPR}
 
       - cache-push@1.0.0:
           inputs:
-            cache_key: pods-pr-\$SCHEME
-            cache_paths:
-${cachePaths}
+            technology: ${iosCacheTechnology}
 
   release:
     envs:
@@ -505,9 +481,7 @@ ${schemeEnvFor(rv.scheme)}
 ${codeSigningStep}
       - cache-pull@1.0.0:
           inputs:
-            cache_key: pods-\$SCHEME
-            cache_paths:
-${cachePaths}
+            technology: ${iosCacheTechnology}
 ${podInstallStep}
       - xcode-archive@1.0.0:
           inputs:
@@ -848,17 +822,23 @@ export async function handleBuildCommand(detectMobileProjectRoot, options = {})
         await handleIosBuildCommand(cwd, options);
         return;
     }
-    if (projectType !== "android") {
-        console.error("Error: Not a mobile project root.");
-        console.error("'ci build' must be run from the root folder of an Android or iOS project.");
-        console.error("\nAndroid projects must contain one of:");
-        console.error("  build.gradle, build.gradle.kts, settings.gradle, settings.gradle.kts, gradlew");
-        console.error("\niOS projects must contain one of:");
-        console.error("  *.xcodeproj, *.xcworkspace, Podfile");
-        process.exit(1);
+    if (projectType === "kmm" || projectType === "android") {
+        await handleAndroidBuildCommand(cwd, options, projectType === "kmm" ? "kmm" : "gradle");
+        return;
     }
+    console.error("Error: Not a mobile project root.");
+    console.error("'ci build' must be run from the root folder of an Android, iOS, or KMM project.");
+    console.error("\nAndroid/KMM projects must contain one of:");
+    console.error("  build.gradle, build.gradle.kts, settings.gradle, settings.gradle.kts, gradlew");
+    console.error("\nKMM projects additionally need: iosApp/, shared/, or composeApp/ directory");
+    console.error("\niOS projects must contain one of:");
+    console.error("  *.xcodeproj, *.xcworkspace, Podfile");
+    process.exit(1);
+}
+async function handleAndroidBuildCommand(cwd, options, cacheTechnology) {
+    const platformLabel = cacheTechnology === "kmm" ? "KMM (Kotlin Multiplatform)" : "Android";
     // 2. Scan the project for potential unknowns
-    console.log("\n🔍 Scanning Android project for potential unknowns...\n");
+    console.log(`\n🔍 Scanning ${platformLabel} project for potential unknowns...\n`);
     const scanResult = await scanAndroidProject(cwd);
     console.log(formatScanResult(scanResult));
     // 3. Prompt for build variants per workflow
@@ -1059,10 +1039,10 @@ export async function handleBuildCommand(detectMobileProjectRoot, options = {})
     // that exact JDK — a newer JDK can cross-compile. Enforce a minimum of 17
     // since ubuntu-latest runners ship with JDK 17+ and JDK <17 is unavailable.
     const javaVersion = Math.max(scanResult.detectedJavaVersion ?? 17, 17);
-    const yaml = generateAndroidPipeline(javaVersion, setupOptions, variants);
+    const yaml = generateAndroidPipeline(javaVersion, setupOptions, variants, cacheTechnology);
     writeFileSync(outputPath, yaml, "utf-8");
     console.log("\n✅ Generated .ci/pipelines/cibuild.yml");
-    console.log("   Platform: Android");
+    console.log(`   Platform: ${platformLabel}`);
     console.log(`   Workflows: primary (${variants.primary.variant}), pull-request (${variants.pullRequest.variant}), release (${variants.release.variant})`);
     if (setupOptions.keystore || setupOptions.keystoreProperties || setupOptions.googleServices || setupOptions.googlePlayDeploy) {
         console.log("   Setup steps included:");

package/dist/src/yaml/steps/cache.js

@@ -80,7 +80,7 @@ export class CachePullStepExecutor extends BaseStepExecutor {
             commands.push('  echo "Restored paths:"');
             for (const path of cachePaths) {
                 commands.push(`  EXPANDED_PATH="${this.escapeBash(path)}"`);
-                commands.push('  EXPANDED_PATH="${EXPANDED_PATH/#~/$HOME}"');
+                commands.push('  EXPANDED_PATH="${EXPANDED_PATH/#~/${CIBUILD_USER_HOME:-$HOME}}"');
                 commands.push('  if [ -e "$EXPANDED_PATH" ]; then');
                 commands.push('    echo "  ✓ $EXPANDED_PATH"');
                 commands.push('  else');
@@ -137,7 +137,7 @@ export class CachePullStepExecutor extends BaseStepExecutor {
             commands.push('  echo "Restored paths:"');
             for (const p of preset.paths) {
                 commands.push(`  EXPANDED="${this.escapeBash(p)}"`);
-                commands.push('  EXPANDED="${EXPANDED/#~/$HOME}"');
+                commands.push('  EXPANDED="${EXPANDED/#~/${CIBUILD_USER_HOME:-$HOME}}"');
                 commands.push('  if [ -e "$EXPANDED" ]; then');
                 commands.push('    echo "  ✓ $EXPANDED"');
                 commands.push('  else');
@@ -234,7 +234,7 @@ export class CachePushStepExecutor extends BaseStepExecutor {
             }
             // Expand tilde by using parameter expansion
             commands.push(`EXPANDED_PATH="${this.escapeBash(resolvedPath)}"`);
-            commands.push('EXPANDED_PATH="${EXPANDED_PATH/#~/$HOME}"');
+            commands.push('EXPANDED_PATH="${EXPANDED_PATH/#~/${CIBUILD_USER_HOME:-$HOME}}"');
             commands.push('');
             commands.push('# Expand glob patterns and check each match');
             commands.push('FOUND_MATCH=false');
@@ -319,7 +319,7 @@ export class CachePushStepExecutor extends BaseStepExecutor {
         commands.push('PATHS_TO_CACHE=()');
         for (const p of preset.paths) {
             commands.push(`EXPANDED="${this.escapeBash(p)}"`);
-            commands.push('EXPANDED="${EXPANDED/#~/$HOME}"');
+            commands.push('EXPANDED="${EXPANDED/#~/${CIBUILD_USER_HOME:-$HOME}}"');
             commands.push('if [ -e "$EXPANDED" ]; then');
             commands.push('  PATHS_TO_CACHE+=("$EXPANDED")');
             if (isDebugMode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invarn/cibuild",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "description": "CI Build CLI — local pipeline orchestration and validation",
   "type": "module",
   "main": "dist/cli.cjs",