nativescript 8.6.1 → 8.6.2-embed.0

package/lib/commands/add-platform.js

@@ -22,7 +22,7 @@ class AddPlatformCommand extends command_base_1.ValidatePlatformCommandBase {
     }
     execute(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.$platformCommandHelper.addPlatforms(args, this.$projectData, this.$options.frameworkPath);
+            yield this.$platformCommandHelper.addPlatforms(args, this.$projectData, this.$options.frameworkPath, this.$options.nativeHost);
         });
     }
     canExecute(args) {

package/lib/controllers/prepare-controller.js

@@ -272,6 +272,7 @@ class PrepareController extends events_1.EventEmitter {
                 packagePath = path.join(platformData.projectRoot, projectData.projectName, "app", "package.json");
             }
             else {
+                console.log("!!!!! VM: proj root: " + platformData.projectRoot);
                 packagePath = path.join(platformData.projectRoot, "app", "src", "main", "assets", "app", "package.json");
             }
             try {

package/lib/data/build-data.js

@@ -23,6 +23,7 @@ class IOSBuildData extends BuildData {
         this.mobileProvisionData = data.mobileProvisionData;
         this.buildForAppStore = data.buildForAppStore;
         this.iCloudContainerEnvironment = data.iCloudContainerEnvironment;
+        this.nativeHost = data.nativeHost;
     }
 }
 exports.IOSBuildData = IOSBuildData;
@@ -36,6 +37,7 @@ class AndroidBuildData extends BuildData {
         this.androidBundle = data.androidBundle || data.aab;
         this.gradlePath = data.gradlePath;
         this.gradleArgs = data.gradleArgs;
+        this.nativeHost = data.nativeHost;
     }
 }
 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.nativeHost = data.nativeHost;
     }
 }
 exports.PrepareData = PrepareData;

package/lib/declarations.d.ts

@@ -581,6 +581,11 @@ interface IAndroidBundleOptions {
 interface IAndroidOptions {
 	gradlePath: string;
 	gradleArgs: string;
+	nativeHost: string;
+}
+
+interface IIOSOptions {
+	nativeHost: string;
 }
 
 interface ITypingsOptions {
@@ -603,6 +608,7 @@ interface IOptions
 		IProvision,
 		ITeamIdentifier,
 		IAndroidOptions,
+		IIOSOptions,
 		IAndroidReleaseOptions,
 		IAndroidBundleOptions,
 		INpmInstallConfigurationOptions,
@@ -1000,6 +1006,7 @@ interface IXcprojService {
 	 * @return {string} The full path to the xcodeproj
 	 */
 	getXcodeprojPath(projectData: IProjectData, projectRoot: string): string;
+	findXcodeProject(dir: string): string;
 }
 
 /**
@@ -1207,7 +1214,8 @@ interface IPlatformCommandHelper {
 	addPlatforms(
 		platforms: string[],
 		projectData: IProjectData,
-		frameworkPath?: string
+		frameworkPath?: string,
+		nativeHost?: string
 	): Promise<void>;
 	cleanPlatforms(
 		platforms: string[],

package/lib/definitions/platform.d.ts

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

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;
@@ -30,7 +31,7 @@ class PlatformCommandHelper {
         this.$projectDataService = $projectDataService;
         this.$tempService = $tempService;
     }
-    addPlatforms(platforms, projectData, frameworkPath) {
+    addPlatforms(platforms, projectData, frameworkPath, nativeHost) {
         return __awaiter(this, void 0, void 0, function* () {
             const platformsDir = projectData.platformsDir;
             this.$fs.ensureDirectoryExists(platformsDir);
@@ -45,6 +46,7 @@ class PlatformCommandHelper {
                     projectDir: projectData.projectDir,
                     platform,
                     frameworkPath,
+                    nativeHost,
                 });
             }
         });
@@ -72,7 +74,9 @@ class PlatformCommandHelper {
                     errorMessage = err.message;
                 }
                 try {
-                    const platformDir = path.join(projectData.platformsDir, platform.toLowerCase());
+                    const platformDir = this.$options.nativeHost
+                        ? this.$options.nativeHost
+                        : path.join(projectData.platformsDir, platform.toLowerCase());
                     this.$fs.deleteDirectory(platformDir);
                     yield this.$packageInstallationManager.uninstall(platformData.frameworkPackageName, projectData.projectDir);
                     this.$logger.info(`Platform ${platform} successfully removed.`);

package/lib/options.js

@@ -200,6 +200,7 @@ class Options {
             },
             gradlePath: { type: "string", hasSensitiveValue: false },
             gradleArgs: { type: "string", hasSensitiveValue: false },
+            nativeHost: { type: "string", hasSensitiveValue: false },
             aab: { type: "boolean", hasSensitiveValue: false },
             performance: { type: "object", hasSensitiveValue: true },
             appleApplicationSpecificPassword: {
@@ -337,7 +338,8 @@ class Options {
         this.$settingsService.setSettings({
             profileDir: this.argv.profileDir,
         });
-        this.argv.profileDir = this.argv["profile-dir"] = this.$settingsService.getProfileDir();
+        this.argv.profileDir = this.argv["profile-dir"] =
+            this.$settingsService.getProfileDir();
         if (this.argv.justlaunch) {
             this.argv.watch = false;
         }

package/lib/services/android-project-service.js

@@ -69,7 +69,9 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
             throw new Error("First call of getPlatformData without providing projectData.");
         }
         if (projectData && projectData.platformsDir) {
-            const projectRoot = path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
+            const projectRoot = this.$options.nativeHost
+                ? this.$options.nativeHost
+                : path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
             const appDestinationDirectoryArr = [
                 projectRoot,
                 constants.APP_FOLDER_NAME,
@@ -247,8 +249,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         });
     }
     interpolateConfigurationFile(projectData) {
-        const manifestPath = this.getPlatformData(projectData)
-            .configurationFilePath;
+        const manifestPath = this.getPlatformData(projectData).configurationFilePath;
         shell.sed("-i", /__PACKAGE__/, projectData.projectIdentifiers.android, manifestPath);
     }
     getProjectNameFromId(projectData) {
@@ -391,7 +392,9 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         return _.values(depsDictionary);
     }
     provideDependenciesJson(projectData, dependencies) {
-        const platformDir = path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
+        const platformDir = this.$options.nativeHost
+            ? this.$options.nativeHost
+            : path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
         const dependenciesJsonPath = path.join(platformDir, constants.DEPENDENCIES_JSON_NAME);
         let nativeDependencyData = dependencies.filter(AndroidProjectService.isNativeAndroidDependency);
         let nativeDependencies = nativeDependencyData.map(({ name, directory, dependencies }) => {

package/lib/services/assets-generation/assets-generation-service.js

@@ -30,13 +30,17 @@ class AssetsGenerationService {
             splash: ["splashBackgrounds", "splashCenterImages", "splashImages"],
         };
     }
-    constructor($logger, $projectDataService, $fs) {
+    constructor($logger, $projectDataService, $fs, $options) {
         this.$logger = $logger;
         this.$projectDataService = $projectDataService;
         this.$fs = $fs;
+        this.$options = $options;
     }
     generateIcons(resourceGenerationData) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.$options.nativeHost) {
+                return;
+            }
             this.$logger.info("Generating icons ...");
             yield this.generateImagesForDefinitions(resourceGenerationData, this.propertiesToEnumerate.icon);
             this.$logger.info("Icons generation completed.");
@@ -44,6 +48,9 @@ class AssetsGenerationService {
     }
     generateSplashScreens(splashesGenerationData) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.$options.nativeHost) {
+                return;
+            }
             this.$logger.info("Generating splash screens ...");
             yield this.generateImagesForDefinitions(splashesGenerationData, this.propertiesToEnumerate.splash);
             this.$logger.info("Splash screens generation completed.");

package/lib/services/ios-project-service.js

@@ -36,13 +36,14 @@ const FRAMEWORK_EXTENSIONS = [".framework", ".xcframework"];
 const getPlatformSdkName = (forDevice) => forDevice ? DevicePlatformSdkName : SimulatorPlatformSdkName;
 const getConfigurationName = (release) => release ? constants_1.Configurations.Release : constants_1.Configurations.Debug;
 class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase {
-    constructor($fs, $childProcess, $cocoapodsService, $errors, $logger, $injector, $projectDataService, $devicePlatformsConstants, $hostInfo, $xcprojService, $iOSProvisionService, $iOSSigningService, $pbxprojDomXcode, $xcode, $iOSEntitlementsService, $platformEnvironmentRequirements, $plistParser, $xcconfigService, $xcodebuildService, $iOSExtensionsService, $iOSWatchAppService, $iOSNativeTargetService, $sysInfo, $tempService, $spmService) {
+    constructor($fs, $childProcess, $cocoapodsService, $errors, $logger, $injector, $projectDataService, $options, $devicePlatformsConstants, $hostInfo, $xcprojService, $iOSProvisionService, $iOSSigningService, $pbxprojDomXcode, $xcode, $iOSEntitlementsService, $platformEnvironmentRequirements, $plistParser, $xcconfigService, $xcodebuildService, $iOSExtensionsService, $iOSWatchAppService, $iOSNativeTargetService, $sysInfo, $tempService, $spmService) {
         super($fs, $projectDataService);
         this.$childProcess = $childProcess;
         this.$cocoapodsService = $cocoapodsService;
         this.$errors = $errors;
         this.$logger = $logger;
         this.$injector = $injector;
+        this.$options = $options;
         this.$devicePlatformsConstants = $devicePlatformsConstants;
         this.$hostInfo = $hostInfo;
         this.$xcprojService = $xcprojService;
@@ -71,7 +72,9 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         if (projectData &&
             projectData.platformsDir &&
             this._platformsDirCache !== projectData.platformsDir) {
-            const projectRoot = path.join(projectData.platformsDir, this.$devicePlatformsConstants.iOS.toLowerCase());
+            const projectRoot = this.$options.nativeHost
+                ? this.$options.nativeHost
+                : path.join(projectData.platformsDir, this.$devicePlatformsConstants.iOS.toLowerCase());
             const runtimePackage = this.$projectDataService.getRuntimePackage(projectData.projectDir, "ios");
             this._platformData = {
                 frameworkPackageName: runtimePackage.name,
@@ -309,7 +312,9 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     }
     prepareProject(projectData, prepareData) {
         return __awaiter(this, void 0, void 0, function* () {
-            const projectRoot = path.join(projectData.platformsDir, "ios");
+            const projectRoot = this.$options.nativeHost
+                ? this.$options.nativeHost
+                : path.join(projectData.platformsDir, this.$devicePlatformsConstants.iOS.toLowerCase());
             const platformData = this.getPlatformData(projectData);
             const pluginsData = this.getAllProductionPlugins(projectData);
             const pbxProjPath = this.getPbxProjPath(projectData);
@@ -326,7 +331,16 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             }
             const project = this.createPbxProj(projectData);
             const resources = project.pbxGroupByName("Resources");
-            if (resources) {
+            if (this.$options.nativeHost) {
+                try {
+                    project.addResourceFile(path.join(this.$options.nativeHost, projectData.projectName));
+                    this.savePbxProj(project, projectData);
+                }
+                catch (err) {
+                    console.log(err);
+                }
+            }
+            if (resources && !this.$options.nativeHost) {
                 const references = project.pbxFileReferenceSection();
                 const xcodeProjectImages = _.map(resources.children, (resource) => this.replace(references[resource.value].name));
                 this.$logger.trace("Images from Xcode project");
@@ -465,6 +479,13 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         return frameworkPath;
     }
     getPbxProjPath(projectData) {
+        if (this.$options.nativeHost) {
+            let xcodeProjectPath = this.$xcprojService.findXcodeProject(this.$options.nativeHost);
+            if (!xcodeProjectPath) {
+                this.$errors.fail("Xcode project not found at the specified directory");
+            }
+            return path.join(xcodeProjectPath, "project.pbxproj");
+        }
         return path.join(this.$xcprojService.getXcodeprojPath(projectData, this.getPlatformData(projectData).projectRoot), "project.pbxproj");
     }
     createPbxProj(projectData) {

package/lib/services/platform/add-platform-service.js

@@ -21,13 +21,17 @@ const constants_1 = require("../../constants");
 const decorators_1 = require("../../common/decorators");
 const yok_1 = require("../../common/yok");
 class AddPlatformService {
-    constructor($fs, $logger, $packageManager, $terminalSpinnerService, $analyticsService) {
+    constructor($fs, $logger, $options, $packageManager, $terminalSpinnerService, $analyticsService) {
         this.$fs = $fs;
         this.$logger = $logger;
+        this.$options = $options;
         this.$packageManager = $packageManager;
         this.$terminalSpinnerService = $terminalSpinnerService;
         this.$analyticsService = $analyticsService;
     }
+    addProjectHost() {
+        return __awaiter(this, void 0, void 0, function* () { });
+    }
     addPlatformSafe(projectData, platformData, packageToInstall, addPlatformData) {
         return __awaiter(this, void 0, void 0, function* () {
             const spinner = this.$terminalSpinnerService.createSpinner();
@@ -95,7 +99,9 @@ class AddPlatformService {
     }
     addNativePlatform(platformData, projectData, frameworkDirPath, frameworkVersion) {
         return __awaiter(this, void 0, void 0, function* () {
-            const platformDir = path.join(projectData.platformsDir, platformData.normalizedPlatformName.toLowerCase());
+            const platformDir = this.$options.nativeHost
+                ? this.$options.nativeHost
+                : path.join(projectData.platformsDir, platformData.normalizedPlatformName.toLowerCase());
             this.$fs.deleteDirectory(platformDir);
             yield platformData.platformProjectService.createProject(path.resolve(frameworkDirPath), frameworkVersion, projectData);
             platformData.platformProjectService.ensureConfigurationFileInAppResources(projectData);

package/lib/services/platform/prepare-native-platform-service.js

@@ -20,11 +20,12 @@ const helpers_1 = require("../../common/helpers");
 const decorators_1 = require("../../common/decorators");
 const yok_1 = require("../../common/yok");
 class PrepareNativePlatformService {
-    constructor($hooksService, $nodeModulesBuilder, $projectChangesService, $metadataFilteringService) {
+    constructor($hooksService, $nodeModulesBuilder, $projectChangesService, $metadataFilteringService, $options) {
         this.$hooksService = $hooksService;
         this.$nodeModulesBuilder = $nodeModulesBuilder;
         this.$projectChangesService = $projectChangesService;
         this.$metadataFilteringService = $metadataFilteringService;
+        this.$options = $options;
     }
     prepareNativePlatform(platformData, projectData, prepareData) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -40,8 +41,10 @@ class PrepareNativePlatformService {
             if (changesInfo.hasChanges) {
                 yield this.cleanProject(platformData, { release });
             }
-            platformData.platformProjectService.prepareAppResources(projectData);
-            if (hasChangesRequirePrepare) {
+            if (!this.$options.nativeHost) {
+                platformData.platformProjectService.prepareAppResources(projectData);
+            }
+            if (hasChangesRequirePrepare || this.$options.nativeHost) {
                 yield platformData.platformProjectService.prepareProject(projectData, prepareData);
             }
             if (hasNativeModulesChange) {

package/lib/services/platform-environment-requirements.js

@@ -74,7 +74,9 @@ class PlatformEnvironmentRequirements {
             win32: "windows",
             darwin: "macos",
         }[process.platform];
-        const anchor = platform ? `#setting-up-${os}-for-${platform.toLowerCase()}` : "";
+        const anchor = platform
+            ? `#setting-up-${os}-for-${platform.toLowerCase()}`
+            : "";
         return (`Verify that your environment is configured according to the system requirements described at\n` +
             `https://docs.nativescript.org/setup/${os}${anchor}.`);
     }

package/lib/services/webpack/webpack-compiler-service.js

@@ -214,10 +214,17 @@ class WebpackCompilerService extends events_1.EventEmitter {
                 args.push("--watch");
             }
             const stdio = prepareData.watch ? ["ipc"] : "inherit";
-            const childProcess = this.$childProcess.spawn(process.execPath, args, {
+            const options = {
                 cwd: projectData.projectDir,
                 stdio,
-            });
+            };
+            if (this.$options.nativeHost) {
+                options.env = {
+                    USER_PROJECT_PLATFORMS_ANDROID: this.$options.nativeHost,
+                    USER_PROJECT_PLATFORMS_IOS: this.$options.nativeHost,
+                };
+            }
+            const childProcess = this.$childProcess.spawn(process.execPath, args, options);
             this.webpackProcesses[platformData.platformNameLowerCase] = childProcess;
             yield this.$cleanupService.addKillProcess(childProcess.pid.toString());
             return childProcess;

package/lib/services/xcproj-service.js

@@ -1,11 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
+const fs = require("fs");
 const constants_1 = require("../constants");
 const yok_1 = require("../common/yok");
 class XcprojService {
     getXcodeprojPath(projectData, projectRoot) {
         return path.join(projectRoot, projectData.projectName + constants_1.IosProjectConstants.XcodeProjExtName);
     }
+    findXcodeProject(dir) {
+        const filesAndDirs = fs.readdirSync(dir);
+        for (let i = 0; i < filesAndDirs.length; i++) {
+            const fullPath = path.join(dir, filesAndDirs[i]);
+            if (fs.statSync(fullPath).isDirectory() &&
+                filesAndDirs[i].endsWith(".xcodeproj")) {
+                return fullPath;
+            }
+        }
+        return null;
+    }
 }
 yok_1.injector.register("xcprojService", XcprojService);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "8.6.1",
+  "version": "8.6.2-embed.0",
   "author": "NativeScript <support@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -185,4 +185,4 @@
     "@npmcli/move-file",
     "stringify-package"
   ]
-}
+}

package/vendor/gradle-plugin/build.gradle

@@ -8,8 +8,27 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 
 buildscript {
+    // project.ext.USER_PROJECT_ROOT = "$rootDir/../../.."
+    project.ext.PLATFORMS_ANDROID = "platforms/android"
+    project.ext.PLUGIN_NAME = "{{pluginName}}"
+
+    def USER_PROJECT_ROOT_FROM_ENV = System.getenv('USER_PROJECT_ROOT');
+    if (USER_PROJECT_ROOT_FROM_ENV != null && !USER_PROJECT_ROOT_FROM_ENV.equals("")) {
+        project.ext.USER_PROJECT_ROOT = USER_PROJECT_ROOT_FROM_ENV;
+    } else {
+        project.ext.USER_PROJECT_ROOT = "$rootDir/../../../"
+    }
+
+    def USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV = System.getenv('USER_PROJECT_PLATFORMS_ANDROID');
+    if (USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV != null && !USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV.equals("")) {
+        project.ext.USER_PROJECT_PLATFORMS_ANDROID = USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV;
+    } else {
+        project.ext.USER_PROJECT_PLATFORMS_ANDROID = project.ext.USER_PROJECT_ROOT + PLATFORMS_ANDROID
+    }
+
+
     def getDepPlatformDir = { dep ->
-        file("${project.ext.USER_PROJECT_ROOT}/${project.ext.PLATFORMS_ANDROID}/${dep.directory}/$PLATFORMS_ANDROID")
+        file("${project.ext.USER_PROJECT_PLATFORMS_ANDROID}/${dep.directory}/$PLATFORMS_ANDROID")
     }
     def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "1.8.20" }
     def kotlinVersion = computeKotlinVersion()
@@ -29,12 +48,8 @@ buildscript {
     project.ext.getDepPlatformDir = getDepPlatformDir
     project.ext.outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
 
-    project.ext.USER_PROJECT_ROOT = "$rootDir/../../.."
-    project.ext.PLATFORMS_ANDROID = "platforms/android"
-    project.ext.PLUGIN_NAME = "{{pluginName}}"
-
     // the build script will not work with previous versions of the CLI (3.1 or earlier)
-    def dependenciesJson = file("${project.ext.USER_PROJECT_ROOT}/${project.ext.PLATFORMS_ANDROID}/dependencies.json")
+    def dependenciesJson = file("${project.ext.USER_PROJECT_PLATFORMS_ANDROID}/dependencies.json")
     def appDependencies = new JsonSlurper().parseText(dependenciesJson.text)
     def pluginData = appDependencies.find { it.name == project.ext.PLUGIN_NAME }
     project.ext.nativescriptDependencies = appDependencies.findAll{pluginData.dependencies.contains(it.name)}

package/vendor/gradle-plugin/settings.gradle

@@ -1,16 +1,26 @@
 import groovy.json.JsonSlurper
 
-def USER_PROJECT_ROOT = "$rootDir/../../../"
+// def USER_PROJECT_ROOT = "$rootDir/../../../"
 def PLATFORMS_ANDROID = "platforms/android"
 def PLUGIN_NAME = "{{pluginName}}"
 
-def dependenciesJson = file("${USER_PROJECT_ROOT}/${PLATFORMS_ANDROID}/dependencies.json")
+def USER_PROJECT_PLATFORMS_ANDROID
+def USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV = System.getenv('USER_PROJECT_PLATFORMS_ANDROID');
+if (USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV != null && !USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV.equals("")) {
+    USER_PROJECT_PLATFORMS_ANDROID = USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV;
+} else {
+    USER_PROJECT_PLATFORMS_ANDROID = "$rootDir/../../../platforms/android"
+}
+
+System.out.println("!!!!! VM: USER_PROJECT_PLATFORMS_ANDROID: " + USER_PROJECT_PLATFORMS_ANDROID);
+
+def dependenciesJson = file("${USER_PROJECT_PLATFORMS_ANDROID}/dependencies.json")
 def appDependencies = new JsonSlurper().parseText(dependenciesJson.text)
 def pluginData = appDependencies.find { it.name == PLUGIN_NAME }
 def nativescriptDependencies = appDependencies.findAll{pluginData.name == it.name}
 
 def getDepPlatformDir = { dep ->
-        file("$USER_PROJECT_ROOT/$PLATFORMS_ANDROID/${dep.directory}/$PLATFORMS_ANDROID")
+        file("$USER_PROJECT_PLATFORMS_ANDROID/${dep.directory}/$PLATFORMS_ANDROID")
 }
 
 def applyIncludeSettingsGradlePlugin = {