Fix up empty values for versionCode

Author: mlynch

packages/configure/test/ops/android.versionCode.test.ts

@@ -0,0 +1,29 @@
+import { copy } from '@ionic/utils-fs';
+import { join } from 'path';
+import tempy from 'tempy';
+
+import { Context, loadContext } from '../../src/ctx';
+import { Operation } from '../../src/definitions';
+import Op from '../../src/operations/android/version';
+import { makeOp } from '../utils';
+
+describe('op: android.versionCode', () => {
+  let dir: string;
+  let ctx: Context;
+
+  beforeEach(async () => {
+    dir = tempy.directory();
+
+    await copy('../common/test/fixtures/ios-and-android', dir);
+
+    ctx = await loadContext(dir);
+    ctx.args.quiet = true;
+  });
+
+  it('shouldn\'t break build when updating empty versionCode', async () => {
+    const op: Operation = makeOp('android', 'versionCode', '');
+    await Op(ctx, op as Operation);
+    expect(await ctx.project.android?.getVersionCode()).toBe(1);
+  });
+
+});

packages/configure/test/ops/ios.buildVersion.test.ts

@@ -0,0 +1,35 @@
+import { copy, readFile, rm } from '@ionic/utils-fs';
+import { join } from 'path';
+import tempy from 'tempy';
+
+import { Context, loadContext } from '../../src/ctx';
+import { IosCopyOperation, Operation } from '../../src/definitions';
+import Op from '../../src/operations/ios/buildVersion';
+
+import { makeOp } from '../utils';
+
+describe('op: ios.buildVersion', () => {
+  let dir: string;
+  let ctx: Context;
+
+  beforeEach(async () => {
+    dir = tempy.directory();
+
+    await copy('../common/test/fixtures/ios-and-android', dir);
+
+    ctx = await loadContext(dir);
+    ctx.args.quiet = true;
+  });
+
+  afterEach(async () => {
+    await rm(dir, { force: true, recursive: true });
+  });
+
+  it('shouldn\'t break build when updating empty buildNumber', async () => {
+    const op: IosCopyOperation = makeOp('ios', 'buildNumber', '');
+
+    await Op(ctx, op as Operation);
+
+    expect(ctx.project.ios?.getBuildProperty(null, null, 'CURRENT_PROJECT_VERSION')).toBe(1);
+  });
+});

packages/project/src/android/project.ts

@@ -271,7 +271,11 @@ export class AndroidProject extends PlatformProject {
   }
 
   setVersionCode(versionCode: number) {
-    return this.appBuildGradle?.setVersionCode(versionCode);
+    if ((versionCode as any) === '') {
+      versionCode = 1;
+    }
+
+    return this.appBuildGradle?.setVersionCode(typeof versionCode === 'number' ? versionCode : 1);
   }
 
   async getVersionCode(): Promise<number | null> {

packages/project/src/ios/project.ts

@@ -196,6 +196,12 @@ export class IosProject extends PlatformProject {
    * If the `targetName` is null the main app target is used. If the `buildName` is null the value is set for both builds (Debug/Release);
    */
   async setBuild(targetName: IosTargetName | null, buildName: IosBuildName | null, buildNumber: number | null) {
+    if ((buildNumber as any) === '') {
+      // This shouldn't happen but can
+      buildNumber = 1;
+      this.pbxProject?.updateBuildProperty('CURRENT_PROJECT_VERSION', 1, buildName, targetName);
+    }
+
     this.pbxProject?.updateBuildProperty('CURRENT_PROJECT_VERSION', buildNumber ?? 1, buildName, targetName);
 
     this.log(`setBuild`, targetName, buildName, `to ${buildNumber ?? 1}`);

packages/project/src/util/pbx.ts

@@ -25,5 +25,9 @@ export function pbxSerializeString(value: string) {
 
 // Remove any quotes at the beginning and end of the string value
 export function pbxReadString(value: string) {
-  return value?.replace(/(^")+|("$)+/g, '');
+  if (typeof value === 'string') {
+    return value?.replace(/(^")+|("$)+/g, '');
+  } else {
+    return value;
+  }
 }