shipthis 0.1.41 → 0.1.42

package/README.md

@@ -415,6 +415,7 @@ The build machines do not keep user files after a job completes.
 - [apiKey](https://shipth.is/docs/reference/apiKey?ref=github_readme) - Commands related to ShipThis API Keys
 - [apple](https://shipth.is/docs/reference/apple?ref=github_readme) - Commands that relate to linking your ShipThis account with your Apple Developer account
 - [game](https://shipth.is/docs/reference/game?ref=github_readme) - Commands that relate to configuring the specific game in the current working directory.
+- [util](https://shipth.is/docs/reference/util?ref=github_readme) - Utility commands that do not require authentication
 
 ### 🔧 Commands
 

package/assets/markdown/confirm-change-android-build-method.md.ejs

@@ -0,0 +1,13 @@
+# Confirm change to export_presets.cfg
+
+**In order to publish your game on Google Play, an edit must be made to your `export_presets.cfg` file to enable the Gradle build method.**
+
+This change is necessary because Google Play requires Android App Bundles (AAB files) for new apps, and the Gradle build method is needed to create AAB files.
+
+You can read more about this in the **ShipThis Documentation** [<%= docsURL %>](<%= docsURL %>)
+
+You are using Godot version **<%= godotVersion %>**, ShipThis will update the **<%= optionKey %>** option in your `export_presets.cfg` file to enable the Gradle build method.
+
+## Do you want to proceed with this change?
+
+Please press **Y** to confirm and proceed with the change or **N** to cancel the operation and exit the Android wizard.

package/dist/{AppleBundleIdDetails-BJC7GCx_.js → AppleBundleIdDetails-jDq3gYbk.js}

@@ -11,27 +11,28 @@ import 'readline-sync';
 import 'luxon';
 import 'axios';
 import 'isomorphic-git';
-import './baseCommand-CTn3KGH3.js';
+import './baseCommand-CscxrTMI.js';
 import '@oclif/core';
 import '@tanstack/react-query';
 import 'react';
 import 'crypto-js';
 import 'uuid';
-import { u as useAppleApp } from './useAppleApp-CR847GWc.js';
+import { u as useAppleApp } from './useAppleApp-DgZH0CBS.js';
 import 'fast-glob';
 import 'yazl';
 import 'socket.io-client';
 import 'fullscreen-ink';
-import { T as Table } from './Table-FaNgpyeq.js';
-import { T as Title } from './Title-BCQtayg6.js';
 import 'string-length';
 import 'strip-ansi';
+import { T as Table } from './Table-FaNgpyeq.js';
+import { T as Title } from './Title-BCQtayg6.js';
 import 'open';
-import './baseGameCommand-8VL7xe-O.js';
+import './baseGameCommand-BKvHM3h_.js';
+import 'godot-export-presets';
 import 'marked';
 import 'marked-terminal';
 import 'qrcode';
-import { u as useAppleBundleId } from './useAppleBundleId-BnwPmVEu.js';
+import { u as useAppleBundleId } from './useAppleBundleId-CA7Pg4Hi.js';
 
 const AppleAppDetails = (props) => {
   const { data, isLoading } = useAppleApp(props);

package/dist/{Command-Cj6F5B5a.js → Command-cVo97lkQ.js}

@@ -2,7 +2,7 @@ import { jsx } from 'react/jsx-runtime';
 import { QueryClientProvider } from '@tanstack/react-query';
 import { useScreenSize } from 'fullscreen-ink';
 import { Box } from 'ink';
-import { H as queryClient } from './baseCommand-CTn3KGH3.js';
+import { I as queryClient } from './baseCommand-CscxrTMI.js';
 import 'axios';
 import 'node:fs';
 import 'crypto-js';
@@ -19,7 +19,7 @@ import 'react';
 import 'socket.io-client';
 import 'fast-glob';
 import 'yazl';
-import { i as CommandProvider } from './baseGameCommand-8VL7xe-O.js';
+import { C as CommandProvider } from './baseGameCommand-BKvHM3h_.js';
 
 const Command = ({ children, command }) => {
   const { width } = useScreenSize();

package/dist/{CommandGame-CuvuH-z6.js → CommandGame-BwudtYCO.js}

@@ -1,6 +1,6 @@
 import { jsx } from 'react/jsx-runtime';
-import { j as GameProvider } from './baseGameCommand-8VL7xe-O.js';
-import { C as Command } from './Command-Cj6F5B5a.js';
+import { G as GameProvider } from './baseGameCommand-BKvHM3h_.js';
+import { C as Command } from './Command-cVo97lkQ.js';
 
 const CommandGame = ({ children, command }) => /* @__PURE__ */ jsx(Command, { command, children: /* @__PURE__ */ jsx(GameProvider, { children }) });
 

package/dist/{Create-pfGYcKu4.js → Create-By4NsPEI.js}

@@ -3,7 +3,7 @@ import { useQueryClient } from '@tanstack/react-query';
 import axios from 'axios';
 import { Box } from 'ink';
 import { useContext } from 'react';
-import { p as getAuthedHeaders, o as API_URL } from './baseCommand-CTn3KGH3.js';
+import { q as getAuthedHeaders, p as API_URL } from './baseCommand-CscxrTMI.js';
 import 'ink-spinner';
 import 'node:crypto';
 import 'node:fs';
@@ -14,7 +14,7 @@ import 'readline-sync';
 import 'luxon';
 import 'isomorphic-git';
 import '@oclif/core';
-import { G as GameContext, k as cacheKeys } from './baseGameCommand-8VL7xe-O.js';
+import { i as GameContext, k as cacheKeys } from './baseGameCommand-BKvHM3h_.js';
 import 'fast-glob';
 import 'uuid';
 import 'yazl';
@@ -28,6 +28,7 @@ import 'marked';
 import 'marked-terminal';
 import 'qrcode';
 import { R as RunWithSpinner } from './RunWithSpinner-DucRnFp6.js';
+import 'godot-export-presets';
 
 const CreateKeystore = ({ onComplete, onError, ...boxProps }) => {
   const { gameId } = useContext(GameContext);

package/dist/{GameStatus-ZSe-qG3y.js → GameStatus-C59zQE1H.js}

@@ -1,9 +1,9 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { Text, Box } from 'ink';
 import { useState, useEffect, useContext } from 'react';
-import { c as getShortDate, P as Platform, k as getProject, E as getProjectPlatformProgress } from './baseCommand-CTn3KGH3.js';
+import { c as getShortDate, P as Platform, l as getProject, M as getProjectPlatformProgress } from './baseCommand-CscxrTMI.js';
 import 'ink-spinner';
-import { g as getShortUUID, m as makeHumanReadable, G as GameContext, C as CommandContext } from './baseGameCommand-8VL7xe-O.js';
+import { g as getShortUUID, m as makeHumanReadable, i as GameContext, j as CommandContext } from './baseGameCommand-BKvHM3h_.js';
 import '@tanstack/react-query';
 import 'axios';
 import 'luxon';
@@ -23,6 +23,7 @@ import 'marked';
 import 'marked-terminal';
 import { N as NextSteps } from './NextSteps-DbJHmscQ.js';
 import 'qrcode';
+import 'godot-export-presets';
 
 function isPlatformConfigured(platform, progress) {
   if (!progress) return false;

package/dist/{Import-D046HBaF.js → Import-DTcVM-T-.js}

@@ -11,7 +11,7 @@ import 'readline-sync';
 import 'luxon';
 import 'axios';
 import 'isomorphic-git';
-import { H as queryClient, P as Platform, C as CredentialsType } from './baseCommand-CTn3KGH3.js';
+import { I as queryClient, P as Platform, C as CredentialsType } from './baseCommand-CscxrTMI.js';
 import '@oclif/core';
 import { useMutation } from '@tanstack/react-query';
 import 'crypto-js';
@@ -24,11 +24,12 @@ import 'string-length';
 import 'strip-ansi';
 import 'open';
 import '@inkjs/ui';
-import { k as cacheKeys, G as GameContext } from './baseGameCommand-8VL7xe-O.js';
+import { k as cacheKeys, i as GameContext } from './baseGameCommand-BKvHM3h_.js';
 import 'marked';
 import 'marked-terminal';
 import 'qrcode';
-import { i as importCredential } from './import-Dk2ywOVU.js';
+import 'godot-export-presets';
+import { i as importCredential } from './import-Bk4w8kks.js';
 
 async function importKeystore({ log = () => {
 }, ...opt }) {

package/dist/{JobLogTail-Da8GuReK.js → JobLogTail-BzisGkY8.js}

@@ -7,12 +7,8 @@ import { useState, useRef, useEffect } from 'react';
 import 'node:fs';
 import 'crypto-js';
 import 'uuid';
-import { p as getAuthedHeaders, o as API_URL, F as castArrayObjectDates, J as JobStatus, a6 as castJobDates, a4 as castObjectDates, a7 as getShortTime } from './baseCommand-CTn3KGH3.js';
-import { k as cacheKeys, x as useJob, h as getStageColor, y as getMessageColor } from './baseGameCommand-8VL7xe-O.js';
+import { q as getAuthedHeaders, p as API_URL, H as castArrayObjectDates, J as JobStatus, a8 as castJobDates, a6 as castObjectDates, a9 as getShortTime } from './baseCommand-CscxrTMI.js';
 import 'luxon';
-import 'fast-glob';
-import 'yazl';
-import 'socket.io-client';
 import 'node:crypto';
 import 'node:path';
 import 'node:readline';
@@ -20,8 +16,12 @@ import 'node:url';
 import 'readline-sync';
 import 'isomorphic-git';
 import '@oclif/core';
+import 'fast-glob';
+import 'yazl';
+import 'socket.io-client';
+import { k as cacheKeys, y as useJob, h as getStageColor, u as getMessageColor } from './baseGameCommand-BKvHM3h_.js';
 import 'fullscreen-ink';
-import { u as useWebSocket } from './useWebSocket-MXDbQHcu.js';
+import { u as useWebSocket } from './useWebSocket-PU55rRGt.js';
 import { T as Title } from './Title-BCQtayg6.js';
 import stringLength from 'string-length';
 import stripAnsi from 'strip-ansi';
@@ -134,7 +134,18 @@ function useJobWatching({
 }
 
 function getSortedJobLogs(logs) {
-  return logs.sort((a, b) => a.sentAt.toMillis() - b.sentAt.toMillis());
+  return [...logs].sort((a, b) => {
+    if (a.sequence != null && b.sequence != null) {
+      return a.sequence - b.sequence;
+    }
+    if (a.sequence != null && b.sequence == null) {
+      return -1;
+    }
+    if (a.sequence == null && b.sequence != null) {
+      return 1;
+    }
+    return a.sentAt.toMillis() - b.sentAt.toMillis();
+  });
 }
 function useJobLogTail({ isWatching, jobId, length, projectId }) {
   const [websocketLogs, setWebsocketLogs] = useState([]);
@@ -183,21 +194,23 @@ const TruncatedText = ({ children, wrap, ...textPropsWithoutWrap }) => {
   return /* @__PURE__ */ jsx(Box, { ref, children: /* @__PURE__ */ jsx(Text, { ...textPropsWithoutWrap, children: getTruncated(children) + "\x1B[0m" }) });
 };
 
+const JobLogLine = ({ log, showTimestamp = true, showStage = true }) => {
+  const stageColor = getStageColor(log.stage);
+  const messageColor = getMessageColor(log.level);
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", height: 1, overflow: "hidden", gap: 1, children: [
+    showTimestamp && /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Text, { children: getShortTime(log.sentAt) }) }),
+    showStage && /* @__PURE__ */ jsx(Box, { justifyContent: "flex-start", width: 9, children: /* @__PURE__ */ jsx(Text, { color: stageColor, children: log.stage }) }),
+    /* @__PURE__ */ jsx(Box, { height: 1, marginRight: 2, overflow: "hidden", children: /* @__PURE__ */ jsx(TruncatedText, { color: messageColor, children: log.message }) })
+  ] }, log.id);
+};
+
 const JobLogTail = (props) => {
   const { data, isLoading } = useJobLogTail(props);
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx(Title, { children: "Job Logs" }),
     isLoading && /* @__PURE__ */ jsx(Spinner, { type: "dots" }),
-    /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: data.map((log) => {
-      const stageColor = getStageColor(log.stage);
-      const messageColor = getMessageColor(log.level);
-      return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", height: 1, overflow: "hidden", children: [
-        /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Text, { children: getShortTime(log.sentAt) }) }),
-        /* @__PURE__ */ jsx(Box, { justifyContent: "flex-start", marginLeft: 1, width: 9, children: /* @__PURE__ */ jsx(Text, { color: stageColor, children: log.stage }) }),
-        /* @__PURE__ */ jsx(Box, { height: 1, marginLeft: 1, marginRight: 2, overflow: "hidden", children: /* @__PURE__ */ jsx(TruncatedText, { color: messageColor, children: log.message }) })
-      ] }, log.id);
-    }) })
+    /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: data.map((log) => /* @__PURE__ */ jsx(JobLogLine, { log }, log.id)) })
   ] });
 };
 
-export { JobLogTail as J, useJobWatching as u };
+export { JobLogTail as J, JobLogLine as a, useJobWatching as u };

package/dist/{JobProgress-DltCQpzA.js → JobProgress-DAnhaTho.js}

@@ -4,20 +4,18 @@ import axios from 'axios';
 import fg from 'fast-glob';
 import { v4 } from 'uuid';
 import { ZipFile } from 'yazl';
-import { H as queryClient, k as getProject, v as DEFAULT_SHIPPED_FILES_GLOBS, w as DEFAULT_IGNORED_FILES_GLOBS, a0 as getNewUploadTicket, a1 as startJobsFromUpload } from './baseCommand-CTn3KGH3.js';
-import { k as cacheKeys, s as getFileHash, t as getPlatformName } from './baseGameCommand-8VL7xe-O.js';
+import { I as queryClient, l as getProject, x as DEFAULT_SHIPPED_FILES_GLOBS, y as DEFAULT_IGNORED_FILES_GLOBS, a2 as getNewUploadTicket, a3 as startJobsFromUpload, a4 as LogLevel } from './baseCommand-CscxrTMI.js';
+import { k as cacheKeys, s as getFileHash, t as getPlatformName, u as getMessageColor } from './baseGameCommand-BKvHM3h_.js';
 import { g as getCWDGitInfo } from './git-BpsfNFZ_.js';
-import { jsx, Fragment } from 'react/jsx-runtime';
-import 'ink';
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { Box, Text } from 'ink';
 import 'ink-spinner';
-import 'react';
+import { useState } from 'react';
 import 'crypto-js';
 import 'luxon';
 import 'socket.io-client';
-import { u as useJobWatching } from './JobLogTail-Da8GuReK.js';
+import { u as useJobWatching, a as JobLogLine } from './JobLogTail-BzisGkY8.js';
 import 'fullscreen-ink';
-import 'string-length';
-import 'strip-ansi';
 import 'open';
 import '@inkjs/ui';
 import 'node:path';
@@ -25,6 +23,9 @@ import 'marked';
 import 'marked-terminal';
 import { P as ProgressSpinner } from './ProgressSpinner-Um6ARKlk.js';
 import 'qrcode';
+import 'string-length';
+import 'strip-ansi';
+import 'godot-export-presets';
 
 async function ship({ command, log = () => {
 }, shipFlags }) {
@@ -113,15 +114,25 @@ const useShip = () => useMutation({
 });
 
 const JobProgress = (props) => {
+  const [lastWarningLog, setLastWarningLog] = useState(null);
   const { progress } = useJobWatching({
     isWatching: true,
     jobId: props.job.id,
     onComplete: props.onComplete,
     onFailure: props.onFailure,
-    projectId: props.job.project.id
+    projectId: props.job.project.id,
+    onNewLogEntry: (logEntry) => {
+      if (logEntry.level == LogLevel.WARN) setLastWarningLog(logEntry);
+    }
   });
   const label = `${getPlatformName(props.job.type)} build progress...`;
-  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(ProgressSpinner, { label, progress, spinnerType: "dots" }) });
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 0, children: [
+    /* @__PURE__ */ jsx(ProgressSpinner, { label, progress, spinnerType: "dots" }),
+    lastWarningLog && /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, marginLeft: 2, children: [
+      /* @__PURE__ */ jsx(Text, { color: getMessageColor(lastWarningLog.level), children: "WARNING" }),
+      /* @__PURE__ */ jsx(JobLogLine, { log: lastWarningLog, showTimestamp: false, showStage: false })
+    ] })
+  ] });
 };
 
 export { JobProgress as J, useShip as u };

package/dist/{JobStatusTable-DVJjHw97.js → JobStatusTable-BYEi8dtD.js}

@@ -3,17 +3,17 @@ import { Box, Text } from 'ink';
 import Spinner from 'ink-spinner';
 import { DateTime } from 'luxon';
 import { useState, useEffect } from 'react';
-import { J as JobStatus } from './baseCommand-CTn3KGH3.js';
+import { J as JobStatus } from './baseCommand-CscxrTMI.js';
 import '@tanstack/react-query';
 import 'axios';
 import 'node:fs';
 import 'crypto-js';
 import 'uuid';
-import { e as getJobSummary, h as getStageColor, f as getJobStatusColor } from './baseGameCommand-8VL7xe-O.js';
+import { e as getJobSummary, h as getStageColor, f as getJobStatusColor } from './baseGameCommand-BKvHM3h_.js';
 import 'fast-glob';
 import 'yazl';
 import 'socket.io-client';
-import { u as useJobWatching } from './JobLogTail-Da8GuReK.js';
+import { u as useJobWatching } from './JobLogTail-BzisGkY8.js';
 import 'fullscreen-ink';
 import { a as StatusRow, b as StatusRowLabel } from './StatusTable-DzRWcMr4.js';
 import { T as Title } from './Title-BCQtayg6.js';

package/dist/{ProjectCredentialsTable-BJJz7W1P.js → ProjectCredentialsTable-NZf3V39z.js}

@@ -10,13 +10,13 @@ import 'readline-sync';
 import 'luxon';
 import 'axios';
 import 'isomorphic-git';
-import './baseCommand-CTn3KGH3.js';
+import './baseCommand-CscxrTMI.js';
 import '@oclif/core';
 import '@tanstack/react-query';
 import 'react';
 import 'crypto-js';
 import 'uuid';
-import { u as useProjectCredentials, g as getProjectCredentialSummary } from './useProjectCredentials-TvlolkId.js';
+import { u as useProjectCredentials, g as getProjectCredentialSummary } from './useProjectCredentials-rQLm2O1J.js';
 import 'fast-glob';
 import 'yazl';
 import 'socket.io-client';

package/dist/{UserCredentialsTable-CSynIVHU.js → UserCredentialsTable-Dp884nYO.js}

@@ -10,7 +10,7 @@ import 'readline-sync';
 import 'luxon';
 import axios from 'axios';
 import 'isomorphic-git';
-import { c as getShortDate, p as getAuthedHeaders, o as API_URL, F as castArrayObjectDates } from './baseCommand-CTn3KGH3.js';
+import { c as getShortDate, q as getAuthedHeaders, p as API_URL, H as castArrayObjectDates } from './baseCommand-CscxrTMI.js';
 import '@oclif/core';
 import { useQuery } from '@tanstack/react-query';
 import 'react';
@@ -18,7 +18,7 @@ import 'crypto-js';
 import 'uuid';
 import 'fast-glob';
 import 'yazl';
-import { k as cacheKeys, g as getShortUUID } from './baseGameCommand-8VL7xe-O.js';
+import { k as cacheKeys, g as getShortUUID } from './baseGameCommand-BKvHM3h_.js';
 import 'socket.io-client';
 import 'fullscreen-ink';
 import { T as Table } from './Table-FaNgpyeq.js';

package/dist/{baseAppleCommand-Aq-Eaw_K.js → baseAppleCommand-DewNWX3L.js}

@@ -1,4 +1,4 @@
-import { B as BaseAuthenticatedCommand } from './baseGameCommand-8VL7xe-O.js';
+import { B as BaseAuthenticatedCommand } from './baseGameCommand-BKvHM3h_.js';
 
 class BaseAppleCommand extends BaseAuthenticatedCommand {
   async init() {

package/dist/{baseCommand-CTn3KGH3.js → baseCommand-CscxrTMI.js}

@@ -13,8 +13,7 @@ import 'node:readline';
 import 'node:url';
 import 'readline-sync';
 import 'isomorphic-git';
-import merge from 'deepmerge';
-import { parse } from 'ini';
+import { getMajorVersion, loadExportPresets, findPreset, getBasePreset, saveExportPresets, mergePresets, ConfigFile } from 'godot-export-presets';
 import { QueryClient } from '@tanstack/react-query';
 import 'react';
 import 'fast-glob';
@@ -444,8 +443,8 @@ const GODOT_CAPABILITIES = [
   { key: "capabilities/access_wifi", name: "Access WiFi", type: CapabilityType.ACCESS_WIFI },
   { key: "capabilities/push_notifications", name: "Push Notifications", type: CapabilityType.PUSH_NOTIFICATIONS }
 ];
-function getGodotProjectCapabilities(platform) {
-  const exportPresets = getGodotExportPresets(platform);
+async function getGodotProjectCapabilities(platform) {
+  const exportPresets = await getGodotExportPresets(platform);
   const options = exportPresets.options || {};
   const capabilities = [];
   for (const capability of GODOT_CAPABILITIES) {
@@ -458,29 +457,34 @@ function getGodotProjectConfig() {
   const cwd = process.cwd();
   const projectGodotPath = path__default.join(cwd, "project.godot");
   const projectGodotContent = fs__default.readFileSync(projectGodotPath, "utf8");
-  return parse(projectGodotContent);
+  const configFile = new ConfigFile();
+  const error = configFile.parse(projectGodotContent);
+  if (error) {
+    throw error;
+  }
+  return configFile;
 }
 function getGodotProjectName() {
   try {
     const projectGodotConfig = getGodotProjectConfig();
-    return projectGodotConfig.application["config/name"];
+    return projectGodotConfig.get_value("application", "config/name") || null;
   } catch {
     return null;
   }
 }
-function getGodotAppleBundleIdentifier() {
+async function getGodotAppleBundleIdentifier() {
   try {
-    const preset = getGodotExportPresets(Platform.IOS);
-    return preset.options["application/bundle_identifier"];
+    const preset = await getGodotExportPresets(Platform.IOS);
+    return preset.options?.["application/bundle_identifier"] || null;
   } catch (error) {
     console.log(error);
     return null;
   }
 }
-function getGodotAndroidPackageName() {
+async function getGodotAndroidPackageName() {
   try {
-    const preset = getGodotExportPresets(Platform.ANDROID);
-    return preset.options["package/unique_name"];
+    const preset = await getGodotExportPresets(Platform.ANDROID);
+    return preset.options?.["package/unique_name"] || null;
   } catch (error) {
     console.log(error);
     return null;
@@ -488,115 +492,81 @@ function getGodotAndroidPackageName() {
 }
 function getGodotVersion() {
   const projectGodotConfig = getGodotProjectConfig();
-  if ("config/features" in projectGodotConfig.application) {
-    const features = projectGodotConfig.application["config/features"];
-    const match = features.match(/"(\d+\.\d+)"/);
-    if (!match) throw new Error("Couldn't find Godot version in project.godot");
-    return match[1];
+  const features = projectGodotConfig.get_value("application", "config/features");
+  if (!features || features.length === 0) {
+    return "3.6";
   }
-  return "3.6";
+  const [version] = features;
+  return version;
 }
-function getGodotExportPresets(platform) {
-  const { warn } = console;
-  let presetConfig = platform === Platform.IOS ? getBaseExportPresets_iOS() : getBaseExportPresets_Android();
+function getExportPresetsPath() {
   const cwd = process.cwd();
   const filename = "export_presets.cfg";
   const exportPresetsPath = path__default.join(cwd, filename);
+  return exportPresetsPath;
+}
+async function getGodotExportPresets(platform) {
+  const { warn } = console;
+  const godotVersion = getGodotVersion();
+  const majorVersion = getMajorVersion(godotVersion);
+  const godotPlatform = platform === Platform.IOS ? "iOS" : "Android";
+  let presetConfig = getBasePreset(godotPlatform, majorVersion);
+  const exportPresetsPath = getExportPresetsPath();
   const isFound = fs__default.existsSync(exportPresetsPath);
   if (isFound) {
-    const exportPresetsContent = fs__default.readFileSync(exportPresetsPath, "utf8");
-    const exportPresetsIni = parse(exportPresetsContent);
-    const presetIndexes = Object.keys(exportPresetsIni.preset || {});
-    const presetIndex = presetIndexes.find((index) => {
-      const current = exportPresetsIni.preset[index];
-      return `${current.name}`.toUpperCase() === platform;
-    });
-    if (presetIndex) {
-      presetConfig = merge(presetConfig, exportPresetsIni.preset[presetIndex]);
-    } else {
-      warn(`Preset ${platform} not found in ${filename} - will use defaults`);
+    try {
+      const exportPresets = await loadExportPresets(exportPresetsPath);
+      const foundPreset = findPreset(exportPresets, { platform: godotPlatform });
+      if (foundPreset) {
+        presetConfig = mergePresets(presetConfig, foundPreset);
+      } else {
+        warn(`Preset ${platform} not found in ${exportPresetsPath} - will use defaults`);
+      }
+    } catch (error) {
+      warn(`Error loading ${exportPresetsPath}: ${error} - will use defaults`);
     }
   } else {
-    warn(`${filename} not found at ${exportPresetsPath}`);
+    warn(`Export presets not found at ${exportPresetsPath} - will use defaults`);
   }
   return presetConfig;
 }
-function getBaseExportPresets_iOS() {
-  return {
-    custom_features: "",
-    dedicated_server: false,
-    encrypt_directory: false,
-    encrypt_pck: false,
-    encryption_exclude_filters: "",
-    encryption_include_filters: "",
-    exclude_filter: "",
-    export_filter: "all_resources",
-    export_path: "output",
-    include_filter: "",
-    name: "iOS",
-    options: {
-      "application/export_project_only": true,
-      "application/icon_interpolation": "4",
-      "application/launch_screens_interpolation": "4",
-      "application/short_version": "1.0.0",
-      // default version number
-      "application/signature": "",
-      "architectures/arm64": true,
-      "capabilities/access_wifi": false,
-      "capabilities/push_notifications": false,
-      "custom_template/debug": "",
-      "custom_template/release": "",
-      "icons/app_store_1024x1024": "",
-      "icons/ipad_76x76": "",
-      "icons/ipad_152x152": "",
-      "icons/ipad_167x167": "",
-      "icons/iphone_120x120": "",
-      "icons/iphone_180x180": "",
-      "icons/notification_40x40": "",
-      "icons/notification_60x60": "",
-      "icons/settings_58x58": "",
-      "icons/settings_87x87": "",
-      "icons/spotlight_40x40": "",
-      "icons/spotlight_80x80": "",
-      "landscape_launch_screens/ipad_1024x768": "",
-      "landscape_launch_screens/ipad_2048x1536": "",
-      "landscape_launch_screens/iphone_2208x1242": "",
-      "landscape_launch_screens/iphone_2436x1125": "",
-      "portrait_launch_screens/ipad_768x1024": "",
-      "portrait_launch_screens/ipad_1536x2048": "",
-      "portrait_launch_screens/iphone_640x960": "",
-      "portrait_launch_screens/iphone_640x1136": "",
-      "portrait_launch_screens/iphone_750x1334": "",
-      "portrait_launch_screens/iphone_1125x2436": "",
-      "portrait_launch_screens/iphone_1242x2208": "",
-      "privacy/camera_usage_description": "",
-      "privacy/camera_usage_description_localized": "{}",
-      "privacy/microphone_usage_description": "",
-      "privacy/microphone_usage_description_localized": "{}",
-      "privacy/photolibrary_usage_description": "",
-      "privacy/photolibrary_usage_description_localized": "{}",
-      "storyboard/custom_bg_color": "Color(0, 0, 0, 1)",
-      "storyboard/custom_image@2x": "",
-      "storyboard/custom_image@3x": "",
-      "storyboard/image_scale_mode": "0",
-      "storyboard/use_custom_bg_color": false,
-      "storyboard/use_launch_screen_storyboard": true,
-      "user_data/accessible_from_files_app": false,
-      "user_data/accessible_from_itunes_sharing": false
-    },
-    platform: "iOS",
-    runnable: true
-  };
-}
-function getBaseExportPresets_Android() {
-  return {
-    name: "Android",
-    // TODO
-    options: {
-      // TODO
-    },
-    platform: "Android"
-  };
+function getGradleBuildOptionKey(majorVersion) {
+  return majorVersion === 4 ? "gradle_build/use_gradle_build" : "custom_build/use_custom_build";
+}
+function getExportFormatOptionKey(majorVersion) {
+  return majorVersion === 4 ? "gradle_build/export_format" : "custom_build/export_format";
+}
+async function isGradleBuildEnabled() {
+  const godotVersion = getGodotVersion();
+  const majorVersion = getMajorVersion(godotVersion);
+  const preset = await getGodotExportPresets(Platform.ANDROID);
+  const buildOptionKey = getGradleBuildOptionKey(majorVersion);
+  const isEnabled = preset.options?.[buildOptionKey];
+  return isEnabled === true || isEnabled === "true";
+}
+async function setGradleBuildEnabled(value) {
+  const exportPresetsPath = getExportPresetsPath();
+  let exportPresets = { presets: [] };
+  if (fs__default.existsSync(exportPresetsPath)) {
+    exportPresets = await loadExportPresets(exportPresetsPath);
+  } else {
+    console.warn(`Export presets not found at ${exportPresetsPath} - creating new file`);
+  }
+  const godotVersion = getGodotVersion();
+  const majorVersion = getMajorVersion(godotVersion);
+  let androidPreset = findPreset(exportPresets, { platform: "Android" });
+  if (!androidPreset) {
+    androidPreset = getBasePreset("Android", majorVersion);
+    exportPresets.presets.push(androidPreset);
+  }
+  const buildOptionKey = getGradleBuildOptionKey(majorVersion);
+  androidPreset.options = androidPreset.options || {};
+  androidPreset.options[buildOptionKey] = value;
+  const exportFormatOptionKey = getExportFormatOptionKey(majorVersion);
+  if (value === false) {
+    androidPreset.options[exportFormatOptionKey] = 0;
+  }
+  await saveExportPresets(exportPresetsPath, exportPresets);
 }
 
 const queryClient = new QueryClient({
@@ -784,4 +754,4 @@ class BaseCommand extends Command {
   }
 }
 
-export { Auth as $, ApiKey as A, BaseCommand as B, CredentialsType as C, DetailsFlags as D, getProjectPlatformProgress as E, castArrayObjectDates as F, GODOT_CAPABILITIES as G, queryClient as H, WS_URL as I, JobStatus as J, getAuthToken as K, downloadBuildById as L, getGoogleStatus as M, getGodotAndroidPackageName as N, enforcePolicy as O, Platform as P, revokePolicy as Q, inviteServiceAccount as R, disconnectGoogle as S, getAPIKeys as T, UserRole as U, createAPIKey as V, WEB_URL as W, revokeAPIKey as X, getSingleUseUrl as Y, acceptTerms as Z, setAuthToken as _, ApiKeyType as a, getNewUploadTicket as a0, startJobsFromUpload as a1, LogLevel as a2, getShortAuthRequiredUrl as a3, castObjectDates as a4, getGoogleAuthUrl as a5, castJobDates as a6, getShortTime as a7, updateProject as a8, getShortDateTime as a9, getShortTimeDelta as aa, JobStage as ab, BuildType as ac, getSelf as ad, getTerms as ae, Certificate as b, getShortDate as c, getGodotAppleBundleIdentifier as d, BundleId as e, App as f, getProjects as g, CapabilityTypeOption as h, BetaGroup as i, isCWDGodotGame as j, getProject as k, CertificateType as l, Profile as m, ProfileType as n, API_URL as o, getAuthedHeaders as p, getGodotProjectCapabilities as q, CapabilityType as r, GameEngine as s, getGodotVersion as t, createProject as u, DEFAULT_SHIPPED_FILES_GLOBS as v, DEFAULT_IGNORED_FILES_GLOBS as w, getGodotProjectName as x, getProjectJobs as y, getJob as z };
+export { acceptTerms as $, ApiKey as A, BaseCommand as B, CredentialsType as C, DetailsFlags as D, getProjectJobs as E, getJob as F, GODOT_CAPABILITIES as G, castArrayObjectDates as H, queryClient as I, JobStatus as J, WS_URL as K, getAuthToken as L, getProjectPlatformProgress as M, downloadBuildById as N, getGoogleStatus as O, Platform as P, getGodotAndroidPackageName as Q, enforcePolicy as R, revokePolicy as S, inviteServiceAccount as T, UserRole as U, disconnectGoogle as V, WEB_URL as W, getAPIKeys as X, createAPIKey as Y, revokeAPIKey as Z, getSingleUseUrl as _, ApiKeyType as a, setAuthToken as a0, Auth as a1, getNewUploadTicket as a2, startJobsFromUpload as a3, LogLevel as a4, getShortAuthRequiredUrl as a5, castObjectDates as a6, getGoogleAuthUrl as a7, castJobDates as a8, getShortTime as a9, updateProject as aa, BuildType as ab, getGradleBuildOptionKey as ac, getShortDateTime as ad, getShortTimeDelta as ae, JobStage as af, getSelf as ag, getTerms as ah, Certificate as b, getShortDate as c, getGodotAppleBundleIdentifier as d, BundleId as e, App as f, getProjects as g, CapabilityTypeOption as h, isGradleBuildEnabled as i, BetaGroup as j, isCWDGodotGame as k, getProject as l, CertificateType as m, Profile as n, ProfileType as o, API_URL as p, getAuthedHeaders as q, getGodotProjectCapabilities as r, setGradleBuildEnabled as s, CapabilityType as t, GameEngine as u, getGodotVersion as v, createProject as w, DEFAULT_SHIPPED_FILES_GLOBS as x, DEFAULT_IGNORED_FILES_GLOBS as y, getGodotProjectName as z };