optikit 1.2.3 → 1.2.5

package/CHANGELOG.md

@@ -10,6 +10,70 @@ We follow Semantic Versioning (SemVer) to indicate the nature of changes:
 
 Each section lists the changes in chronological order, with the most recent release at the top. We also include links to relevant discussions or issues when appropriate.
 
+## [1.2.5]
+
+### Added
+
+- **Simultaneous Build Number Bump:** New `bump-build` command that increments both Android and iOS build numbers simultaneously without changing the version number
+- **Comprehensive Documentation:** Updated USAGE.md with detailed section for the new bump-build command
+
+### Improved
+
+- **Build Number Management:** Enhanced flexibility for managing builds across both platforms with a single command
+
+## [1.2.4]
+
+### Fixed
+
+- **iOS Build Number Tracking:** Fixed `bump-ios` command to increment the actual iOS build number from `project.pbxproj` instead of deriving from Android build number
+- **Independent Platform Builds:** iOS and Android build numbers now tracked independently as intended
+
+### Added
+
+- **iOS Build Number Reader:** New `getCurrentIosBuildNumber()` function to read actual iOS build number from `ios/Runner.xcodeproj/project.pbxproj`
+- **Enhanced Version Display:** `version` command now shows both Android and iOS build numbers separately
+
+### Improved
+
+- **Version Management Accuracy:** iOS build numbers now accurately reflect the actual project state
+
+## [1.2.3]
+
+### Fixed
+
+- **Silent Validation:** Removed unwanted version number output during command execution by implementing silent validation checks
+
+### Added
+
+- **Silent Command Execution:** New `execCommandSilent()` function for validation operations that don't need output logging
+
+### Improved
+
+- **User Experience:** Cleaner command output without version information appearing during validation
+
+## [1.2.2]
+
+### Fixed
+
+- **Command Naming Conflicts:** Resolved yargs command conflicts that prevented version bump commands from working correctly
+- **Version Bump Accuracy:** Fixed issue where major/minor/patch bumps were only incrementing Android build numbers
+
+### Changed
+
+- **Simplified Command Names:**
+  - `version bump <type>` renamed to `bump <type>` for major/minor/patch version bumps
+  - `version bump-ios` renamed to `bump-ios`
+  - `version bump-android` renamed to `bump-android`
+  - `version` command renamed to `version` for displaying current version
+
+### Added
+
+- **FVM Default Configuration:** Changed default `useFvmByDefault` setting to `true` in `init` command configuration
+
+### Improved
+
+- **Documentation:** Updated all documentation files (USAGE.md, VERSION_MANAGEMENT.md, README.md) with new command names and workflows
+
 ## [1.2.1]
 
 ### Added

package/USAGE.md

@@ -188,6 +188,30 @@ After: 1.0.2+46 (iOS: 1 unchanged)
 
 ---
 
+### Bump Both Build Numbers
+
+Increment both Android and iOS build numbers:
+
+```bash
+optikit bump-build
+```
+
+**What it does:**
+
+- Keeps version unchanged
+- Increments Android build number
+- Increments iOS build number
+- Perfect for simultaneous Android and iOS releases
+
+**Example:**
+
+```text
+Before: 1.0.2+45 (iOS: 3)
+After: 1.0.2+46 (iOS: 4)
+```
+
+---
+
 ## Build Commands
 
 All build commands support FVM and create automatic backups.

package/dist/cli.js

@@ -14,7 +14,7 @@ import { createRequire } from "module";
 import { createVscodeSettings } from "./commands/project/setup.js";
 import { initializeProject } from "./commands/config/init.js";
 import { rollbackFiles, rollbackRestore } from "./commands/config/rollback.js";
-import { bumpVersion, bumpIosBuildOnly, bumpAndroidBuildOnly, showCurrentVersion } from "./commands/version/bump.js";
+import { bumpVersion, bumpIosBuildOnly, bumpAndroidBuildOnly, bumpBothBuilds, showCurrentVersion } from "./commands/version/bump.js";
 import { listDevices, runApp, runAppInteractive } from "./commands/project/devices.js";
 const require = createRequire(import.meta.url);
 const packageInfo = require("../package.json");
@@ -175,6 +175,9 @@ const options = yargs(hideBin(process.argv))
 })
     .command("bump-android", "Increment Android build number only", () => { }, async () => {
     await bumpAndroidBuildOnly();
+})
+    .command("bump-build", "Increment both Android and iOS build numbers", () => { }, async () => {
+    await bumpBothBuilds();
 })
     .command("version", "Show current version information", () => { }, async () => {
     await showCurrentVersion();

package/dist/commands/version/bump.js

@@ -1,9 +1,9 @@
 import { validateFlutterProject } from "../../utils/validators/validation.js";
 import { LoggerHelpers } from "../../utils/services/logger.js";
-import { getCurrentVersion, incrementVersion, formatVersion } from "../../utils/helpers/version.js";
+import { getCurrentVersion, incrementVersion, formatVersion, getCurrentIosBuildNumber } from "../../utils/helpers/version.js";
 import { updateFlutterVersion } from "./update.js";
 import chalk from "chalk";
-export { bumpVersion, bumpIosBuildOnly, bumpAndroidBuildOnly, showCurrentVersion };
+export { bumpVersion, bumpIosBuildOnly, bumpAndroidBuildOnly, bumpBothBuilds, showCurrentVersion };
 /**
  * Bumps version with semantic versioning (major, minor, patch)
  * Android build number increments with version
@@ -62,14 +62,15 @@ async function bumpIosBuildOnly() {
     try {
         const current = getCurrentVersion();
         const currentVersionString = `${current.major}.${current.minor}.${current.patch}`;
-        // iOS build number increments from current Android build number
-        const nextIosBuild = current.buildNumber + 1;
+        // Read actual iOS build number from project.pbxproj
+        const currentIosBuild = getCurrentIosBuildNumber();
+        const nextIosBuild = currentIosBuild + 1;
         LoggerHelpers.info(`Current version: ${formatVersion(current)}`);
         LoggerHelpers.info("Incrementing iOS build number only (for TestFlight)...");
         console.log(chalk.cyan("\nBuild number changes:"));
         console.log(chalk.gray("  Version:"), chalk.white(`${currentVersionString} (unchanged)`));
         console.log(chalk.gray("  Android:"), chalk.white(`${current.buildNumber} (unchanged)`));
-        console.log(chalk.gray("  iOS:"), chalk.white(`${current.buildNumber} → ${nextIosBuild}`), chalk.green("(incremented)"));
+        console.log(chalk.gray("  iOS:"), chalk.white(`${currentIosBuild} → ${nextIosBuild}`), chalk.green("(incremented)"));
         console.log();
         // Update only iOS build number
         await updateFlutterVersion(currentVersionString, "", // Empty string means don't update Android
@@ -123,6 +124,46 @@ async function bumpAndroidBuildOnly() {
         process.exit(1);
     }
 }
+/**
+ * Increments BOTH Android and iOS build numbers
+ * Keeps version unchanged
+ * Perfect for updating both platforms simultaneously
+ */
+async function bumpBothBuilds() {
+    // Pre-flight validation
+    if (!validateFlutterProject()) {
+        process.exit(1);
+    }
+    try {
+        const current = getCurrentVersion();
+        const currentVersionString = `${current.major}.${current.minor}.${current.patch}`;
+        // Read actual iOS build number from project.pbxproj
+        const currentIosBuild = getCurrentIosBuildNumber();
+        const nextAndroidBuild = current.buildNumber + 1;
+        const nextIosBuild = currentIosBuild + 1;
+        LoggerHelpers.info(`Current version: ${formatVersion(current)}`);
+        LoggerHelpers.info("Incrementing both Android and iOS build numbers...");
+        console.log(chalk.cyan("\nBuild number changes:"));
+        console.log(chalk.gray("  Version:"), chalk.white(`${currentVersionString} (unchanged)`));
+        console.log(chalk.gray("  Android:"), chalk.white(`${current.buildNumber} → ${nextAndroidBuild}`), chalk.green("(incremented)"));
+        console.log(chalk.gray("  iOS:"), chalk.white(`${currentIosBuild} → ${nextIosBuild}`), chalk.green("(incremented)"));
+        console.log();
+        // Update both Android and iOS build numbers
+        await updateFlutterVersion(currentVersionString, nextAndroidBuild.toString(), nextIosBuild.toString());
+        LoggerHelpers.success(`Both build numbers incremented successfully`);
+        console.log(chalk.gray("\nResult:"), chalk.white(`${currentVersionString}+${nextAndroidBuild} (iOS: ${nextIosBuild})`));
+        console.log(chalk.gray("Use this for:"), chalk.white("Simultaneous Android and iOS releases"));
+    }
+    catch (error) {
+        if (error instanceof Error) {
+            LoggerHelpers.error(`Error incrementing build numbers: ${error.message}`);
+        }
+        else {
+            LoggerHelpers.error(`Error incrementing build numbers: ${error}`);
+        }
+        process.exit(1);
+    }
+}
 /**
  * Shows current version information
  */
@@ -130,12 +171,14 @@ async function showCurrentVersion() {
     try {
         const current = getCurrentVersion();
         const versionString = formatVersion(current);
+        const currentIosBuild = getCurrentIosBuildNumber();
         console.log(chalk.bold("\n📱 Current Version Information\n"));
         console.log(chalk.cyan("Version:"), chalk.white.bold(versionString));
         console.log(chalk.gray("  Major:"), chalk.white(current.major));
         console.log(chalk.gray("  Minor:"), chalk.white(current.minor));
         console.log(chalk.gray("  Patch:"), chalk.white(current.patch));
-        console.log(chalk.gray("  Build:"), chalk.white(current.buildNumber));
+        console.log(chalk.gray("  Android Build:"), chalk.white(current.buildNumber));
+        console.log(chalk.gray("  iOS Build:"), chalk.white(currentIosBuild));
         console.log();
     }
     catch (error) {

package/dist/utils/helpers/version.js

@@ -1,6 +1,7 @@
 import fs from "fs";
 import path from "path";
-export { parseVersion, incrementVersion, getCurrentVersion };
+import { LoggerHelpers } from "../services/logger.js";
+export { parseVersion, incrementVersion, getCurrentVersion, getCurrentIosBuildNumber };
 /**
  * Parses a version string in format "X.Y.Z+B"
  * @param versionString - Version string (e.g., "1.2.3+45")
@@ -78,3 +79,28 @@ export function getNextBuildNumber() {
     const current = getCurrentVersion();
     return current.buildNumber + 1;
 }
+/**
+ * Gets the current iOS build number from project.pbxproj
+ * @returns Current iOS build number, or 1 if not found
+ */
+function getCurrentIosBuildNumber() {
+    try {
+        const projectPbxProjPath = path.join(process.cwd(), "ios/Runner.xcodeproj/project.pbxproj");
+        if (!fs.existsSync(projectPbxProjPath)) {
+            LoggerHelpers.warning("iOS project.pbxproj not found. Defaulting to build number 1.");
+            return 1;
+        }
+        const projectContent = fs.readFileSync(projectPbxProjPath, 'utf8');
+        // Match CURRENT_PROJECT_VERSION = <number>;
+        const buildMatch = projectContent.match(/CURRENT_PROJECT_VERSION\s*=\s*(\d+);/);
+        if (!buildMatch) {
+            LoggerHelpers.warning("CURRENT_PROJECT_VERSION not found in project.pbxproj. Defaulting to build number 1.");
+            return 1;
+        }
+        return parseInt(buildMatch[1], 10);
+    }
+    catch (error) {
+        LoggerHelpers.warning(`Error reading iOS build number: ${error instanceof Error ? error.message : error}. Defaulting to 1.`);
+        return 1;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "optikit",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "OptiKit CLI",
   "main": "src/cli.ts",
   "type": "module",

package/src/cli.ts

@@ -24,6 +24,7 @@ import {
   bumpVersion,
   bumpIosBuildOnly,
   bumpAndroidBuildOnly,
+  bumpBothBuilds,
   showCurrentVersion
 } from "./commands/version/bump.js";
 import { listDevices, runApp, runAppInteractive } from "./commands/project/devices.js";
@@ -283,6 +284,14 @@ const options = yargs(hideBin(process.argv))
       await bumpAndroidBuildOnly();
     }
   )
+  .command(
+    "bump-build",
+    "Increment both Android and iOS build numbers",
+    () => {},
+    async () => {
+      await bumpBothBuilds();
+    }
+  )
   .command(
     "version",
     "Show current version information",

package/src/commands/version/bump.ts

@@ -4,7 +4,8 @@ import {
   getCurrentVersion,
   incrementVersion,
   formatVersion,
-  getNextBuildNumber
+  getNextBuildNumber,
+  getCurrentIosBuildNumber
 } from "../../utils/helpers/version.js";
 import { updateFlutterVersion } from "./update.js";
 import chalk from "chalk";
@@ -13,6 +14,7 @@ export {
   bumpVersion,
   bumpIosBuildOnly,
   bumpAndroidBuildOnly,
+  bumpBothBuilds,
   showCurrentVersion
 };
 
@@ -87,8 +89,9 @@ async function bumpIosBuildOnly(): Promise<void> {
     const current = getCurrentVersion();
     const currentVersionString = `${current.major}.${current.minor}.${current.patch}`;
 
-    // iOS build number increments from current Android build number
-    const nextIosBuild = current.buildNumber + 1;
+    // Read actual iOS build number from project.pbxproj
+    const currentIosBuild = getCurrentIosBuildNumber();
+    const nextIosBuild = currentIosBuild + 1;
 
     LoggerHelpers.info(`Current version: ${formatVersion(current)}`);
     LoggerHelpers.info("Incrementing iOS build number only (for TestFlight)...");
@@ -96,7 +99,7 @@ async function bumpIosBuildOnly(): Promise<void> {
     console.log(chalk.cyan("\nBuild number changes:"));
     console.log(chalk.gray("  Version:"), chalk.white(`${currentVersionString} (unchanged)`));
     console.log(chalk.gray("  Android:"), chalk.white(`${current.buildNumber} (unchanged)`));
-    console.log(chalk.gray("  iOS:"), chalk.white(`${current.buildNumber} → ${nextIosBuild}`), chalk.green("(incremented)"));
+    console.log(chalk.gray("  iOS:"), chalk.white(`${currentIosBuild} → ${nextIosBuild}`), chalk.green("(incremented)"));
     console.log();
 
     // Update only iOS build number
@@ -163,6 +166,56 @@ async function bumpAndroidBuildOnly(): Promise<void> {
   }
 }
 
+/**
+ * Increments BOTH Android and iOS build numbers
+ * Keeps version unchanged
+ * Perfect for updating both platforms simultaneously
+ */
+async function bumpBothBuilds(): Promise<void> {
+  // Pre-flight validation
+  if (!validateFlutterProject()) {
+    process.exit(1);
+  }
+
+  try {
+    const current = getCurrentVersion();
+    const currentVersionString = `${current.major}.${current.minor}.${current.patch}`;
+
+    // Read actual iOS build number from project.pbxproj
+    const currentIosBuild = getCurrentIosBuildNumber();
+    const nextAndroidBuild = current.buildNumber + 1;
+    const nextIosBuild = currentIosBuild + 1;
+
+    LoggerHelpers.info(`Current version: ${formatVersion(current)}`);
+    LoggerHelpers.info("Incrementing both Android and iOS build numbers...");
+
+    console.log(chalk.cyan("\nBuild number changes:"));
+    console.log(chalk.gray("  Version:"), chalk.white(`${currentVersionString} (unchanged)`));
+    console.log(chalk.gray("  Android:"), chalk.white(`${current.buildNumber} → ${nextAndroidBuild}`), chalk.green("(incremented)"));
+    console.log(chalk.gray("  iOS:"), chalk.white(`${currentIosBuild} → ${nextIosBuild}`), chalk.green("(incremented)"));
+    console.log();
+
+    // Update both Android and iOS build numbers
+    await updateFlutterVersion(
+      currentVersionString,
+      nextAndroidBuild.toString(),
+      nextIosBuild.toString()
+    );
+
+    LoggerHelpers.success(`Both build numbers incremented successfully`);
+    console.log(chalk.gray("\nResult:"), chalk.white(`${currentVersionString}+${nextAndroidBuild} (iOS: ${nextIosBuild})`));
+    console.log(chalk.gray("Use this for:"), chalk.white("Simultaneous Android and iOS releases"));
+
+  } catch (error) {
+    if (error instanceof Error) {
+      LoggerHelpers.error(`Error incrementing build numbers: ${error.message}`);
+    } else {
+      LoggerHelpers.error(`Error incrementing build numbers: ${error}`);
+    }
+    process.exit(1);
+  }
+}
+
 /**
  * Shows current version information
  */
@@ -170,13 +223,15 @@ async function showCurrentVersion(): Promise<void> {
   try {
     const current = getCurrentVersion();
     const versionString = formatVersion(current);
+    const currentIosBuild = getCurrentIosBuildNumber();
 
     console.log(chalk.bold("\n📱 Current Version Information\n"));
     console.log(chalk.cyan("Version:"), chalk.white.bold(versionString));
     console.log(chalk.gray("  Major:"), chalk.white(current.major));
     console.log(chalk.gray("  Minor:"), chalk.white(current.minor));
     console.log(chalk.gray("  Patch:"), chalk.white(current.patch));
-    console.log(chalk.gray("  Build:"), chalk.white(current.buildNumber));
+    console.log(chalk.gray("  Android Build:"), chalk.white(current.buildNumber));
+    console.log(chalk.gray("  iOS Build:"), chalk.white(currentIosBuild));
     console.log();
 
   } catch (error) {

package/src/utils/helpers/version.ts

@@ -2,7 +2,7 @@ import fs from "fs";
 import path from "path";
 import { LoggerHelpers } from "../services/logger.js";
 
-export { parseVersion, incrementVersion, getCurrentVersion, VersionInfo };
+export { parseVersion, incrementVersion, getCurrentVersion, getCurrentIosBuildNumber, VersionInfo };
 
 /**
  * Version information structure
@@ -107,3 +107,33 @@ export function getNextBuildNumber(): number {
   const current = getCurrentVersion();
   return current.buildNumber + 1;
 }
+
+/**
+ * Gets the current iOS build number from project.pbxproj
+ * @returns Current iOS build number, or 1 if not found
+ */
+function getCurrentIosBuildNumber(): number {
+  try {
+    const projectPbxProjPath = path.join(process.cwd(), "ios/Runner.xcodeproj/project.pbxproj");
+
+    if (!fs.existsSync(projectPbxProjPath)) {
+      LoggerHelpers.warning("iOS project.pbxproj not found. Defaulting to build number 1.");
+      return 1;
+    }
+
+    const projectContent = fs.readFileSync(projectPbxProjPath, 'utf8');
+
+    // Match CURRENT_PROJECT_VERSION = <number>;
+    const buildMatch = projectContent.match(/CURRENT_PROJECT_VERSION\s*=\s*(\d+);/);
+
+    if (!buildMatch) {
+      LoggerHelpers.warning("CURRENT_PROJECT_VERSION not found in project.pbxproj. Defaulting to build number 1.");
+      return 1;
+    }
+
+    return parseInt(buildMatch[1], 10);
+  } catch (error) {
+    LoggerHelpers.warning(`Error reading iOS build number: ${error instanceof Error ? error.message : error}. Defaulting to 1.`);
+    return 1;
+  }
+}