Merge branch 'master' into androidDefaultLang

tidev · Apr 30, 2024 · 4295123 · 4295123
2 parents 693afb4 + 760ca45
commit 4295123
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/cli/commands/build.js b/cli/commands/build.js
@@ -121,7 +121,7 @@ exports.config = function config(logger, config, cli) {
 								if (fs.existsSync(path.join(projectDir, 'tiapp.xml'))) {
 									let tiapp;
 									try {
-										tiapp = cli.tiapp = new tiappxml(path.join(projectDir, 'tiapp.xml'));
+										tiapp = cli.tiapp = new tiappxml(path.join(projectDir, 'tiapp.xml'), cli.argv.platform);
 									} catch (ex) {
 										logger.error(ex);
 										logger.log();

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -106,7 +106,7 @@
     "markdown": "0.5.0",
     "moment": "2.29.4",
     "node-appc": "1.1.6",
-    "node-titanium-sdk": "5.1.9",
+    "node-titanium-sdk": "6.0.0",
     "node-uuid": "1.4.8",
     "nodeify": "1.0.1",
     "p-limit": "3.1.0",