@akylas/nativescript-cli 8.7.2 → 8.8.2

package/lib/commands/prepare.js

@@ -15,8 +15,12 @@ const yok_1 = require("../common/yok");
 class PrepareCommand extends command_base_1.ValidatePlatformCommandBase {
     constructor($options, $prepareController, $platformValidationService, $projectData, $platformCommandParameter, $platformsDataService, $prepareDataService, $migrateController) {
         super($options, $platformsDataService, $platformValidationService, $projectData);
+        this.$options = $options;
         this.$prepareController = $prepareController;
+        this.$platformValidationService = $platformValidationService;
+        this.$projectData = $projectData;
         this.$platformCommandParameter = $platformCommandParameter;
+        this.$platformsDataService = $platformsDataService;
         this.$prepareDataService = $prepareDataService;
         this.$migrateController = $migrateController;
         this.allowedParameters = [this.$platformCommandParameter];
@@ -27,6 +31,11 @@ class PrepareCommand extends command_base_1.ValidatePlatformCommandBase {
                 hasSensitiveValue: false,
             },
             hmr: { type: "boolean", default: false, hasSensitiveValue: false },
+            whatever: {
+                type: "boolean",
+                default: false,
+                hasSensitiveValue: false,
+            },
         };
         this.$projectData.initializeProjectData();
     }

package/lib/commands/typings.js

@@ -73,7 +73,7 @@ class TypingsCommand {
                 return [];
             }
             const items = res.map((item) => {
-                const [group, artifact, version, sha1, file] = item.split("/");
+                const [group, artifact, version, sha1, file] = item.split(path.sep);
                 return {
                     id: sha1 + version,
                     group,

package/lib/common/mobile/android/android-virtual-device-service.js

@@ -152,7 +152,10 @@ class AndroidVirtualDeviceService {
                 ];
             }
             if (canExecuteAvdManagerCommand) {
-                result = yield this.$childProcess.trySpawnFromCloseEvent(this.pathToAvdManagerExecutable, ["list", "avds"], { shell: this.$hostInfo.isWindows });
+                const sanitizedPathToAvdManagerExecutable = this.$hostInfo.isWindows
+                    ? (0, helpers_1.quoteString)(this.pathToAvdManagerExecutable)
+                    : this.pathToAvdManagerExecutable;
+                result = yield this.$childProcess.trySpawnFromCloseEvent(sanitizedPathToAvdManagerExecutable, ["list", "avds"], { shell: this.$hostInfo.isWindows });
             }
             else if (this.pathToAndroidExecutable &&
                 this.$fs.exists(this.pathToAndroidExecutable)) {

package/lib/common/mobile/android/logcat-helper.js

@@ -65,16 +65,17 @@ class LogcatHelper {
                 this.mapDevicesLoggingData[deviceIdentifier].rawLineStream =
                     rawLineStream;
                 rawLineStream.on("data", (lineBuffer) => {
-                    var _a, _b;
+                    var _a, _b, _c, _d;
                     if (!((_a = this.mapDevicesLoggingData[deviceIdentifier]) === null || _a === void 0 ? void 0 : _a.loggingProcess))
                         return;
                     const lines = (lineBuffer.toString() || "").split("\n");
                     for (let line of lines) {
-                        if (line.includes("START") &&
-                            line.includes(options.appId) &&
-                            !line.includes(options.pid)) {
+                        const startProc = /Start proc (?<pid>[0-9]+):(?<appId>.+?)\//.exec(line);
+                        if (startProc &&
+                            ((_b = startProc.groups) === null || _b === void 0 ? void 0 : _b.appId) === options.appId &&
+                            ((_c = startProc.groups) === null || _c === void 0 ? void 0 : _c.pid) !== options.pid) {
                             this.forceStop(deviceIdentifier);
-                            (_b = options.onAppRestarted) === null || _b === void 0 ? void 0 : _b.call(options);
+                            (_d = options.onAppRestarted) === null || _d === void 0 ? void 0 : _d.call(options);
                         }
                     }
                 });
@@ -150,7 +151,15 @@ class LogcatHelper {
     getAppStartTrackingLogcatStream(deviceIdentifier, appId) {
         return __awaiter(this, void 0, void 0, function* () {
             const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
-            const logcatCommand = [`logcat`, `-b`, `system`, `-T`, `1`];
+            const logcatCommand = [
+                `logcat`,
+                `-b`,
+                `system`,
+                `-T`,
+                `1`,
+                "-s",
+                "ActivityManager",
+            ];
             if (appId) {
                 logcatCommand.push(`--regex=START.*${appId}`);
             }

package/lib/common/mobile/emulator-helper.js

@@ -7,6 +7,7 @@ const yok_1 = require("../yok");
 class EmulatorHelper {
     constructor() {
         this.mapAndroidApiLevelToVersion = {
+            "android-35": "15.0.0",
             "android-34": "14.0.0",
             "android-33": "13.0.0",
             "android-32": "12.0.0",

package/lib/common/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Utils = void 0;
+exports.capitalizeFirstLetter = exports.Utils = void 0;
 const yok_1 = require("./yok");
 class Utils {
     constructor($options, $logger) {
@@ -28,4 +28,11 @@ class Utils {
     }
 }
 exports.Utils = Utils;
+function capitalizeFirstLetter(value) {
+    if (!value) {
+        return "";
+    }
+    return value.charAt(0).toUpperCase() + value.slice(1);
+}
+exports.capitalizeFirstLetter = capitalizeFirstLetter;
 yok_1.injector.register("utils", Utils);

package/lib/controllers/migrate-controller.js

@@ -49,7 +49,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "@nativescript/core",
                 minVersion: "6.5.0",
-                desiredVersion: "~8.7.0",
+                desiredVersion: "~8.8.0",
                 shouldAddIfMissing: true,
             },
             {
@@ -59,7 +59,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "@nativescript/types",
                 minVersion: "7.0.0",
-                desiredVersion: "~8.7.0",
+                desiredVersion: "~8.8.0",
                 isDev: true,
             },
             {
@@ -113,7 +113,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "@nativescript/angular",
                 minVersion: "10.0.0",
-                desiredVersion: "^17.0.0",
+                desiredVersion: "^18.0.0",
                 shouldMigrateAction(dependency, projectData, loose) {
                     return __awaiter(this, void 0, void 0, function* () {
                         if (!this.hasDependency(dependency, projectData)) {
@@ -197,13 +197,13 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "@nativescript/ios",
                 minVersion: "6.5.3",
-                desiredVersion: "~8.7.0",
+                desiredVersion: "~8.8.0",
                 isDev: true,
             },
             {
                 packageName: "@nativescript/android",
                 minVersion: "7.0.0",
-                desiredVersion: "~8.7.0",
+                desiredVersion: "~8.8.0",
                 isDev: true,
             },
         ];
@@ -782,7 +782,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
     migrateNativeScriptAngular() {
         return __awaiter(this, void 0, void 0, function* () {
             const minVersion = "10.0.0";
-            const desiredVersion = "~17.3.0";
+            const desiredVersion = "~18.0.0";
             const dependencies = [
                 {
                     packageName: "@angular/animations",

package/lib/controllers/platform-controller.js

@@ -72,6 +72,10 @@ class PlatformController {
     }
     addPlatformIfNeeded(addPlatformData, projectData) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (addPlatformData.hostProjectPath) {
+                this.$logger.trace("Not adding platform because --hostProjectPath is provided.");
+                return;
+            }
             const [platform] = addPlatformData.platform.toLowerCase().split("@");
             projectData !== null && projectData !== void 0 ? projectData : (projectData = this.$projectDataService.getProjectData(addPlatformData.projectDir));
             const platformData = this.$platformsDataService.getPlatformData(platform, projectData);

package/lib/controllers/prepare-controller.js

@@ -14,6 +14,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrepareController = void 0;
 const choki = require("chokidar");
@@ -24,13 +35,15 @@ const decorators_1 = require("../common/decorators");
 const helpers_1 = require("../common/helpers");
 const yok_1 = require("../common/yok");
 const constants_1 = require("../constants");
+const resolve_package_path_1 = require("@rigor789/resolve-package-path");
 class PrepareController extends events_1.EventEmitter {
-    constructor($platformController, $hooksService, $fs, $logger, $mobileHelper, $nodeModulesDependenciesBuilder, $platformsDataService, $pluginsService, $prepareNativePlatformService, $projectChangesService, $projectDataService, $webpackCompilerService, $watchIgnoreListService, $analyticsService, $markingModeService, $projectConfigService, $projectService) {
+    constructor($platformController, $hooksService, $fs, $logger, $options, $mobileHelper, $nodeModulesDependenciesBuilder, $platformsDataService, $pluginsService, $prepareNativePlatformService, $projectChangesService, $projectDataService, $webpackCompilerService, $watchIgnoreListService, $analyticsService, $markingModeService, $projectConfigService, $projectService) {
         super();
         this.$platformController = $platformController;
         this.$hooksService = $hooksService;
         this.$fs = $fs;
         this.$logger = $logger;
+        this.$options = $options;
         this.$mobileHelper = $mobileHelper;
         this.$nodeModulesDependenciesBuilder = $nodeModulesDependenciesBuilder;
         this.$platformsDataService = $platformsDataService;
@@ -248,32 +261,66 @@ class PrepareController extends events_1.EventEmitter {
         });
     }
     writeRuntimePackageJson(projectData, platformData) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const configInfo = this.$projectConfigService.detectProjectConfigs(projectData.projectDir);
             if (configInfo.usingNSConfig) {
                 return;
             }
             this.$logger.info("Updating runtime package.json with configuration values...");
-            const nsConfig = this.$projectConfigService.readConfig(projectData.projectDir);
-            const packageData = Object.assign(Object.assign(Object.assign({}, _.pick(projectData.packageJsonData, ["name"])), nsConfig), { main: "bundle" });
-            if (platformData.platformNameLowerCase === "ios" &&
-                packageData.ios &&
-                packageData.ios.discardUncaughtJsExceptions) {
-                packageData.discardUncaughtJsExceptions =
-                    packageData.ios.discardUncaughtJsExceptions;
+            const _c = this.$projectConfigService.readConfig(projectData.projectDir), { hooks, ignoredNativeDependencies, webpackPackageName, webpackConfigPath, appResourcesPath, buildPath, appPath } = _c, nsConfig = __rest(_c, ["hooks", "ignoredNativeDependencies", "webpackPackageName", "webpackConfigPath", "appResourcesPath", "buildPath", "appPath"]);
+            const platform = platformData.platformNameLowerCase;
+            let installedRuntimePackageJSON;
+            let runtimePackageName;
+            if (platform === "ios") {
+                runtimePackageName = ((_a = projectData.nsConfig.ios) === null || _a === void 0 ? void 0 : _a.runtimePackageName) || constants_1.SCOPED_IOS_RUNTIME_NAME;
+            }
+            else if (platform === "android") {
+                runtimePackageName = ((_b = projectData.nsConfig.android) === null || _b === void 0 ? void 0 : _b.runtimePackageName) || constants_1.SCOPED_ANDROID_RUNTIME_NAME;
+            }
+            const installedRuntimePackageJSONPath = (0, resolve_package_path_1.resolvePackageJSONPath)(runtimePackageName, {
+                paths: [projectData.projectDir],
+            });
+            if (installedRuntimePackageJSONPath) {
+                installedRuntimePackageJSON = this.$fs.readJson(installedRuntimePackageJSONPath);
             }
-            if (platformData.platformNameLowerCase === "android" &&
-                packageData.android &&
-                packageData.android.discardUncaughtJsExceptions) {
-                packageData.discardUncaughtJsExceptions =
-                    packageData.android.discardUncaughtJsExceptions;
+            const packageData = Object.assign(Object.assign(Object.assign(Object.assign({}, _.pick(projectData.packageJsonData, ["name"])), nsConfig), { main: "bundle" }), (installedRuntimePackageJSON ? {} : {}));
+            if (platform === "ios") {
+                if (installedRuntimePackageJSON) {
+                    packageData.ios = packageData.ios || {};
+                    packageData.ios.runtime = {
+                        version: installedRuntimePackageJSON.version
+                    };
+                }
+                if (packageData.ios &&
+                    packageData.ios.discardUncaughtJsExceptions) {
+                    packageData.discardUncaughtJsExceptions =
+                        packageData.ios.discardUncaughtJsExceptions;
+                }
+                delete packageData.android;
+            }
+            if (platform === "android") {
+                if (installedRuntimePackageJSON) {
+                    packageData.android = packageData.android || {};
+                    packageData.android.runtime = {
+                        version: installedRuntimePackageJSON.version,
+                        version_info: installedRuntimePackageJSON.version_info,
+                        gradle: installedRuntimePackageJSON.gradle
+                    };
+                }
+                if (packageData.android &&
+                    packageData.android.discardUncaughtJsExceptions) {
+                    packageData.discardUncaughtJsExceptions =
+                        packageData.android.discardUncaughtJsExceptions;
+                }
+                delete packageData.ios;
             }
             let packagePath;
             if (this.$mobileHelper.isApplePlatform(platformData.platformNameLowerCase)) {
                 packagePath = path.join(platformData.projectRoot, projectData.projectName, "app", "package.json");
             }
             else {
-                packagePath = path.join(platformData.projectRoot, "app", "src", "main", "assets", "app", "package.json");
+                packagePath = path.join(platformData.projectRoot, this.$options.hostProjectModuleName, "src", this.$options.hostProjectPath ? "nativescript" : "main", "assets", "app", "package.json");
             }
             try {
                 const emittedPackageData = this.$fs.readJson(packagePath);

package/lib/data/build-data.js

@@ -24,6 +24,7 @@ class IOSBuildData extends BuildData {
         this.mobileProvisionData = data.mobileProvisionData;
         this.buildForAppStore = data.buildForAppStore;
         this.iCloudContainerEnvironment = data.iCloudContainerEnvironment;
+        this.hostProjectPath = data.hostProjectPath;
     }
 }
 exports.IOSBuildData = IOSBuildData;
@@ -39,6 +40,7 @@ class AndroidBuildData extends BuildData {
         this.gradleFlavor = data.gradleFlavor;
         this.gradlePath = data.gradlePath;
         this.gradleArgs = data.gradleArgs;
+        this.hostProjectPath = data.hostProjectPath;
     }
 }
 exports.AndroidBuildData = AndroidBuildData;

package/lib/data/prepare-data.js

@@ -29,6 +29,7 @@ class PrepareData extends controller_data_base_1.ControllerDataBase {
         if (_.isBoolean(data.watchNative)) {
             this.watchNative = data.watchNative;
         }
+        this.hostProjectPath = data.hostProjectPath;
     }
 }
 exports.PrepareData = PrepareData;

package/lib/declarations.d.ts

@@ -578,14 +578,20 @@ interface IAndroidBundleOptions {
 	aab: boolean;
 }
 
-interface IAndroidOptions {
-	gradleArgs: string[];
-	gradleFlavor: string;
+interface IEmbedOptions {
+	hostProjectPath: string;
+	hostProjectModuleName: string;
+}
+
+interface IAndroidOptions extends IEmbedOptions {
 	gradlePath: string;
+	gradleFlavor: string;
 	gradleArgs: string[];
 	overrideRuntimeGradleFiles: boolean;
 }
 
+interface IIOSOptions extends IEmbedOptions {}
+
 interface ITypingsOptions {
 	jar: string;
 	aar: string;
@@ -606,6 +612,7 @@ interface IOptions
 		IProvision,
 		ITeamIdentifier,
 		IAndroidOptions,
+		IIOSOptions,
 		IAndroidReleaseOptions,
 		IAndroidBundleOptions,
 		INpmInstallConfigurationOptions,
@@ -704,6 +711,9 @@ interface IOptions
 	dryRun: boolean;
 
 	platformOverride: string;
+
+	// allow arbitrary options
+	[optionName: string]: any;
 }
 
 interface IEnvOptions {
@@ -1012,6 +1022,7 @@ interface IXcprojService {
 	 * @return {string} The full path to the xcodeproj
 	 */
 	getXcodeprojPath(projectData: IProjectData, projectRoot: string): string;
+	findXcodeProject(dir: string): string;
 }
 
 /**

package/lib/definitions/android-plugin-migrator.d.ts

@@ -12,6 +12,7 @@ interface IAndroidBuildOptions {
 	tempPluginDirPath: string;
 	gradleArgs?: string[];
 	gradlePath?: string;
+	aarSuffix?: string;
 }
 
 interface IAndroidPluginBuildService {

package/lib/definitions/platform.d.ts

@@ -118,6 +118,7 @@ interface ICheckEnvironmentRequirementsOutput {
 
 interface IAddPlatformData extends IControllerDataBase {
 	frameworkPath?: string;
+	hostProjectPath?: string;
 }
 
 interface IPlatformController {

package/lib/definitions/prepare.d.ts

@@ -11,6 +11,9 @@ declare global {
 		watch?: boolean;
 		watchNative: boolean;
 		watchNodeModules?: boolean;
+
+		// embedding
+		hostProjectPath?: string;
 	}
 
 	interface IiOSCodeSigningData {

package/lib/definitions/project.d.ts

@@ -104,6 +104,7 @@ interface INsConfigPlaform {
 interface INsConfigIOS extends INsConfigPlaform {
 	discardUncaughtJsExceptions?: boolean;
 	runtimePackageName?: string
+	cocoapodUseBundleExec?: boolean
 }
 
 interface INSConfigVisionOS extends INsConfigIOS {}
@@ -147,6 +148,8 @@ interface INsConfigAndroid extends INsConfigPlaform {
 
 	gradleArgs?: string[];
 
+	plugins?:{ [k:string]: { aarSuffix?: string } }
+
 	runtimePackageName?: string
 }
 
@@ -170,6 +173,7 @@ interface INsConfig {
 	visionos?: INSConfigVisionOS;
 	ignoredNativeDependencies?: string[];
 	hooks?: INsConfigHooks[];
+	projectName?: string;
 }
 
 interface IProjectData extends ICreateProjectData {
@@ -204,6 +208,7 @@ interface IProjectData extends ICreateProjectData {
 	 * The value can be changed by setting `webpackConfigPath` in nativescript.config.
 	 */
 	webpackConfigPath: string;
+	projectName: string;
 
 	/**
 	 * Initializes project data with the given project directory. If none supplied defaults to --path option or cwd.

package/lib/helpers/platform-command-helper.js

@@ -16,11 +16,12 @@ const _ = require("lodash");
 const constants = require("../constants");
 const yok_1 = require("../common/yok");
 class PlatformCommandHelper {
-    constructor($platformController, $fs, $errors, $logger, $mobileHelper, $packageInstallationManager, $pacoteService, $platformsDataService, $platformValidationService, $projectChangesService, $projectDataService, $tempService) {
+    constructor($platformController, $fs, $errors, $logger, $options, $mobileHelper, $packageInstallationManager, $pacoteService, $platformsDataService, $platformValidationService, $projectChangesService, $projectDataService, $tempService) {
         this.$platformController = $platformController;
         this.$fs = $fs;
         this.$errors = $errors;
         this.$logger = $logger;
+        this.$options = $options;
         this.$mobileHelper = $mobileHelper;
         this.$packageInstallationManager = $packageInstallationManager;
         this.$pacoteService = $pacoteService;
@@ -32,6 +33,10 @@ class PlatformCommandHelper {
     }
     addPlatforms(platforms, projectData, frameworkPath) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.$options.hostProjectPath) {
+                this.$logger.info("Ignoring platform add becuase of --hostProjectPath flag");
+                return;
+            }
             const platformsDir = projectData.platformsDir;
             this.$fs.ensureDirectoryExists(platformsDir);
             for (const platform of platforms) {
@@ -61,6 +66,10 @@ class PlatformCommandHelper {
     }
     removePlatforms(platforms, projectData) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.$options.hostProjectPath) {
+                this.$logger.info("Ignoring platform remove becuase of --native-host flag");
+                return;
+            }
             for (const platform of platforms) {
                 this.$platformValidationService.validatePlatformInstalled(platform, projectData);
                 const platformData = this.$platformsDataService.getPlatformData(platform, projectData);

package/lib/options.js

@@ -15,6 +15,7 @@ const yargs = require("yargs");
 const helpers_1 = require("yargs/helpers");
 const _ = require("lodash");
 const yok_1 = require("./common/yok");
+const constants_1 = require("./constants");
 class Options {
     setupOptions(commandSpecificDashedOptions) {
         if (commandSpecificDashedOptions) {
@@ -205,13 +206,19 @@ class Options {
                 hasSensitiveValue: false,
             },
             overrideRuntimeGradleFiles: { type: "boolean", hasSensitiveValue: false },
+            gradleFlavor: { type: "string", hasSensitiveValue: false },
+            gradlePath: { type: "string", hasSensitiveValue: false },
             gradleArgs: {
                 type: "string",
                 hasSensitiveValue: false,
                 array: true,
             },
-            gradleFlavor: { type: "string", hasSensitiveValue: false },
-            gradlePath: { type: "string", hasSensitiveValue: false },
+            hostProjectPath: { type: "string", hasSensitiveValue: false },
+            hostProjectModuleName: {
+                type: "string",
+                hasSensitiveValue: false,
+                default: constants_1.APP_FOLDER_NAME,
+            },
             aab: { type: "boolean", hasSensitiveValue: false },
             filterDevicesArch: { type: "boolean", hasSensitiveValue: false },
             performance: { type: "object", hasSensitiveValue: true },

package/lib/project-data.js

@@ -70,7 +70,10 @@ class ProjectData {
                 `Additional technical info: ${err.toString()}`);
         }
         if (packageJsonData) {
-            this.projectName = this.$projectHelper.sanitizeName(path.basename(projectDir));
+            this.projectName =
+                nsConfig && nsConfig.projectName
+                    ? nsConfig.projectName
+                    : this.$projectHelper.sanitizeName(path.basename(projectDir));
             this.nsConfig = nsConfig;
             this.platformsDir = path.join(projectDir, this.getBuildRelativeDirectoryPath());
             this.projectFilePath = projectFilePath;

package/lib/providers/project-files-provider.js

@@ -23,7 +23,7 @@ class ProjectFilesProvider extends project_files_provider_base_1.ProjectFilesPro
         }
         else {
             relativePath = path.relative(projectData.appDirectoryPath, parsedFilePath);
-            mappedFilePath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, relativePath);
+            mappedFilePath = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, relativePath);
         }
         const appResourcesDirectoryPath = projectData.appResourcesDirectoryPath;
         const platformSpecificAppResourcesDirectoryPath = path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName);

package/lib/services/android/gradle-build-args-service.js

@@ -46,10 +46,11 @@ class GradleBuildArgsService {
             projectDir: buildData.projectDir,
         });
         this.$projectData.initializeProjectData(buildData.projectDir);
-        args.push(`--stacktrace`, `-PcompileSdk=android-${toolsInfo.compileSdkVersion}`, `-PtargetSdk=${toolsInfo.targetSdkVersion}`, `-PbuildToolsVersion=${toolsInfo.buildToolsVersion}`, `-PgenerateTypings=${toolsInfo.generateTypings}`, `-PprojectRoot=${this.$projectData.projectDir}`, `-DprojectRoot=${this.$projectData.projectDir}`, `-PappPath=${this.$projectData.getAppDirectoryPath()}`, `-PappBuildPath=${this.$projectData.getBuildRelativeDirectoryPath()}`, `-DappBuildPath=${this.$projectData.getBuildRelativeDirectoryPath()}`, `-PappPath=${this.$projectData.getAppDirectoryPath()}`, `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`);
-        if (buildData.gradleArgs) {
+        args.push(`--stacktrace`, `-PcompileSdk=${toolsInfo.compileSdkVersion}`, `-PtargetSdk=${toolsInfo.targetSdkVersion}`, `-PbuildToolsVersion=${toolsInfo.buildToolsVersion}`, `-PgenerateTypings=${toolsInfo.generateTypings}`, `-PprojectRoot=${this.$projectData.projectDir}`, `-DprojectRoot=${this.$projectData.projectDir}`, `-PappPath=${this.$projectData.getAppDirectoryPath()}`, `-PappBuildPath=${this.$projectData.getBuildRelativeDirectoryPath()}`, `-DappBuildPath=${this.$projectData.getBuildRelativeDirectoryPath()}`, `-PappPath=${this.$projectData.getAppDirectoryPath()}`, `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`);
+        const gradleArgs = (this.$projectData.nsConfig.android.gradleArgs || []).concat(buildData.gradleArgs || []);
+        if (gradleArgs) {
             const additionalArgs = [];
-            buildData.gradleArgs.forEach((arg) => {
+            gradleArgs.forEach((arg) => {
                 additionalArgs.push(...arg.split(" ").map((a) => a.trim()));
             });
             args.push(...additionalArgs);

package/lib/services/android/gradle-command-service.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GradleCommandService = void 0;
 const yok_1 = require("../../common/yok");
+const helpers_1 = require("../../common/helpers");
 class GradleCommandService {
     constructor($childProcess, $errors, $hostInfo, $logger) {
         this.$childProcess = $childProcess;
@@ -29,7 +30,10 @@ class GradleCommandService {
                 shell: this.$hostInfo.isWindows,
             };
             const gradleExecutable = (_a = options.gradlePath) !== null && _a !== void 0 ? _a : (this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
-            const result = yield this.executeCommandSafe(gradleExecutable, gradleArgs, childProcessOptions, spawnOptions);
+            const sanitizedGradleArgs = this.$hostInfo.isWindows
+                ? gradleArgs.map((arg) => (0, helpers_1.quoteString)(arg))
+                : gradleArgs;
+            const result = yield this.executeCommandSafe(gradleExecutable, sanitizedGradleArgs, childProcessOptions, spawnOptions);
             return result;
         });
     }