fix: android & ios commands

package.json

@@ -4,16 +4,17 @@
   "description": "Github Action to bump Android & iOS versions and build numbers",
   "main": "dist/index.js",
   "scripts": {
-    "build": "ncc build ./src/index.ts -s -m -o dist"
+    "build": "ncc build ./src/index.ts -s -m -o dist",
+    "publish": ""
   },
   "dependencies": {
     "@actions/core": "1.10.0",
     "@actions/exec": "1.1.1"
   },
   "devDependencies": {
-    "@types/node": "18.13.0",
+    "@types/node": "18.15.3",
     "@vercel/ncc": "0.36.1",
-    "typescript": "4.9.5"
+    "typescript": "5.0.2"
   },
   "keywords": [
     "github",

src/android.ts

@@ -4,27 +4,41 @@ import { setOutput } from '@actions/core'
 import { readFile, writeFile } from 'fs'
 import { Output } from "./types";
 
-const versionCodeRegex = new RegExp(/^(\s*versionCode(?:\s|=)\s*)(\d+.*)/, "g")
-const versionNameRegex = new RegExp(/(versionName(?:\s|=)*)(.*)/, "g")
+const versionCodeRegex = new RegExp(/^(\s*versionCode(?:\s|=)\s*)(\d+.*)/, "g");
+const versionNameRegex = new RegExp(/(versionName(?:\s|=)*)(.*)/, "g");
+
+const getVersionCodeLine = (versionCodeLine: string, versionCode: string | string[]) => {
+  const forceVersionCode = parseInt(typeof versionCode === 'string' ? versionCode : versionCode?.[0]?.toString())
+  const versionCodeLineArray = versionCodeLine.split(' ')
+  const currentVersionCode = parseInt(versionCodeLineArray.pop()) + 1
+  const nextVersionCode = forceVersionCode || currentVersionCode
+
+  setOutput(Output.AndroidVersionCode, nextVersionCode)
+  return `${versionCodeLineArray.join(' ')} ${nextVersionCode}`
+}
+
+const getVersionNameLine = (versionNameLine: string, bumpType: string) => {
+  const versionNameLineArray = versionNameLine.split(' ')
+  const currentVersionName = versionNameLineArray.pop().replace(new RegExp('"', 'g'), '')
+  const nextVersionName = bumpedVersion(currentVersionName, bumpType)
+
+  setOutput(Output.AndroidVersion, nextVersionName)
+  return `${versionNameLineArray.join(' ')} "${nextVersionName}"`
+}
+
 
 export function bumpAndroidValues({ androidPath, versionCode, bumpType }: { androidPath: string; versionCode: string; bumpType: string }) {
   const gradlePath = `${androidPath}/app/build.gradle`
 
   readFile(gradlePath, 'utf8', (_, data) => {
-    const currentVersionName = data.match(versionNameRegex)[0].split("=")[1].trim();
-    const currentVersionCode = data.match(versionCodeRegex)[0].split("=")[1].trim();
-    const nextVersionCode = parseInt(versionCode || currentVersionCode) + 1
-    const nextVersionName = bumpedVersion(currentVersionName, bumpType)
-
-    const nextData = data
-      .replace(versionCodeRegex, `$1${nextVersionCode}`)
-      .replace(versionNameRegex, `$1\"${nextVersionName}\"`)
-
-    writeFile(gradlePath, nextData, function (err) {
-      if (err) throw err;
-      setOutput(Output.AndroidVersion, nextVersionName)
-      setOutput(Output.AndroidVersionCode, nextVersionCode)
-    });
-  });
+    const fileLines = data.split("\n")
+    const versionCodeLineIndex = fileLines.findIndex(line => line.match(versionCodeRegex))
+    const versionNameLineIndex = fileLines.findIndex(line => line.match(versionNameRegex))
+
+    fileLines[versionCodeLineIndex] = getVersionCodeLine(fileLines[versionCodeLineIndex], versionCode)
+    fileLines[versionNameLineIndex] = getVersionNameLine(fileLines[versionNameLineIndex], bumpType)
+
+    writeFile(gradlePath, fileLines.join("\n"), (error) => { if (error) throw error })
+  })
 }
 

src/helpers.ts

@@ -1,5 +1,5 @@
 export const bumpedVersion = (version: string, bumpType: string) => {
-  const [major, minor, patch] = version.split(".")
+  const [major, minor, patch] = version.replace(new RegExp('"', 'g'), '').split(".")
 
   switch (bumpType) {
     case "major":

src/index.ts

@@ -10,8 +10,8 @@ const run = () => {
   const versionCode = getInput(Input.VersionCode)
   const buildNumber = getInput(Input.BuildNumber)
 
-  if (iosPath) bumpIosValues({ iosPath, buildNumber, bumpType })
   if (androidPath) bumpAndroidValues({ androidPath, versionCode, bumpType })
+  if (iosPath) bumpIosValues({ iosPath, buildNumber, bumpType })
 }
 
 try {

src/ios.ts

@@ -5,16 +5,16 @@ import { Output } from "./types"
 
 async function bumpIosVersion(path: string, bumpType: string) {
   const options = { cwd: path }
-  const { stdout: currentIosVersion } = await getExecOutput("agvtool", ["what-marketing-version"], options)
+  const { stdout: currentIosVersion } = await getExecOutput("agvtool", ["what-marketing-version", "-terse1"], options)
   const version = bumpedVersion(currentIosVersion.toString().trim(), bumpType)
 
   const { stdout: iosVersion } = await getExecOutput("agvtool", ["new-marketing-version", version], options)
   setOutput(Output.IosVersion, iosVersion.toString().trim())
 }
 
 async function bumpBuildNumber(path: string, buildNumber?: string) {
-  const command = buildNumber ? "new-version" : "next-version"
-  const { stdout: iosBuildNumber } = await getExecOutput("agvtool", [command, buildNumber], { cwd: path })
+  const params = buildNumber ? ["new-version", "-all", buildNumber] : ["next-version", "-all"]
+  const { stdout: iosBuildNumber } = await getExecOutput("agvtool", params, { cwd: path })
 
   setOutput(Output.IosBuildNumber, iosBuildNumber.toString().trim())
 }