nativescript 8.4.0 → 8.5.0-dev.0

package/config/test-deps-versions-generated.json

@@ -1 +1 @@
-{"@jsdevtools/coverage-istanbul-loader":"3.0.5","karma":"6.4.1","karma-coverage":"2.2.0","karma-nativescript-launcher":"0.4.0","mocha":"10.1.0","karma-mocha":"2.0.1","karma-chai":"0.1.0","karma-jasmine":"4.0.2","karma-qunit":"4.1.2","@types/karma-chai":"0.1.3","@types/mocha":"10.0.1","@types/jasmine":"4.3.0","@types/qunit":"2.19.3","nyc":"15.1.0"}
+{"@jsdevtools/coverage-istanbul-loader":"3.0.5","karma":"6.4.1","karma-coverage":"2.2.0","karma-nativescript-launcher":"0.4.0","mocha":"10.2.0","karma-mocha":"2.0.1","karma-chai":"0.1.0","karma-jasmine":"4.0.2","karma-qunit":"4.1.2","@types/karma-chai":"0.1.3","@types/mocha":"10.0.1","@types/jasmine":"4.3.1","@types/qunit":"2.19.4","nyc":"15.1.0"}

package/lib/.d.ts

@@ -371,6 +371,7 @@
 /// <reference path="services/ios-watch-app-service.ts" />
 /// <reference path="services/ios/export-options-plist-service.ts" />
 /// <reference path="services/ios/ios-signing-service.ts" />
+/// <reference path="services/ios/spm-service.ts" />
 /// <reference path="services/ios/xcodebuild-args-service.ts" />
 /// <reference path="services/ios/xcodebuild-command-service.ts" />
 /// <reference path="services/ios/xcodebuild-service.ts" />

package/lib/bootstrap.js

@@ -27,6 +27,7 @@ yok_1.injector.require("iOSProjectService", "./services/ios-project-service");
 yok_1.injector.require("iOSProvisionService", "./services/ios-provision-service");
 yok_1.injector.require("xcconfigService", "./services/xcconfig-service");
 yok_1.injector.require("iOSSigningService", "./services/ios/ios-signing-service");
+yok_1.injector.require("spmService", "./services/ios/spm-service");
 yok_1.injector.require("xcodebuildArgsService", "./services/ios/xcodebuild-args-service");
 yok_1.injector.require("xcodebuildCommandService", "./services/ios/xcodebuild-command-service");
 yok_1.injector.require("xcodebuildService", "./services/ios/xcodebuild-service");

package/lib/commands/typings.js

@@ -95,7 +95,8 @@ class TypingsCommand {
                 this.$logger.warn("--filter flag is not supported yet.");
             }
             this.$fs.ensureDirectoryExists(path.resolve(this.$projectData.projectDir, "typings", "ios"));
-            yield this.$childProcess.spawnFromEvent("ns", ["build", "ios"], "exit", {
+            const nsPath = path.resolve(__dirname, "../../bin/nativescript.js");
+            yield this.$childProcess.spawnFromEvent("node", [nsPath, "build", "ios"], "exit", {
                 env: Object.assign(Object.assign({}, process.env), { TNS_TYPESCRIPT_DECLARATIONS_PATH: path.resolve(this.$projectData.projectDir, "typings", "ios") }),
                 stdio: "inherit",
             });

package/lib/definitions/ios.d.ts

@@ -41,6 +41,10 @@ declare global {
 		): Promise<string>;
 	}
 
+	interface ISPMService {
+		applySPMPackages(platformData: IPlatformData, projectData: IProjectData);
+	}
+
 	interface IXcodebuildArgsService {
 		getBuildForSimulatorArgs(
 			platformData: IPlatformData,
@@ -52,6 +56,10 @@ declare global {
 			projectData: IProjectData,
 			buildConfig: IBuildConfig
 		): Promise<string[]>;
+		getXcodeProjectArgs(
+			projectRoot: string,
+			projectData: IProjectData
+		): string[];
 	}
 
 	interface IXcodebuildCommandService {

package/lib/services/android-plugin-build-service.js

@@ -101,22 +101,6 @@ class AndroidPluginBuildService {
             return promise;
         });
     }
-    getIncludeGradleCompileDependenciesScope(includeGradleFileContent) {
-        const indexOfDependenciesScope = includeGradleFileContent.indexOf("dependencies");
-        const result = [];
-        if (indexOfDependenciesScope === -1) {
-            return result;
-        }
-        const indexOfRepositoriesScope = includeGradleFileContent.indexOf("repositories");
-        let repositoriesScope = "";
-        if (indexOfRepositoriesScope >= 0) {
-            repositoriesScope = this.getScope("repositories", includeGradleFileContent);
-            result.push(repositoriesScope);
-        }
-        const dependenciesScope = this.getScope("dependencies", includeGradleFileContent);
-        result.push(dependenciesScope);
-        return result;
-    }
     getScope(scopeName, content) {
         const indexOfScopeName = content.indexOf(scopeName);
         const openingBracket = "{";
@@ -253,10 +237,8 @@ class AndroidPluginBuildService {
             const buildGradlePath = path.join(pluginTempDir, "build.gradle");
             const settingsGradlePath = path.join(pluginTempDir, "settings.gradle");
             this.$fs.copyFile(allGradleTemplateFiles, pluginTempDir);
-            this.addCompileDependencies(platformsAndroidDirPath, buildGradlePath);
             const runtimeGradleVersions = yield this.getRuntimeGradleVersions(projectDir);
             this.replaceGradleVersion(pluginTempDir, runtimeGradleVersions.gradleVersion);
-            this.replaceGradleAndroidPluginVersion(buildGradlePath, runtimeGradleVersions.gradleAndroidPluginVersion);
             this.replaceFileContent(buildGradlePath, "{{pluginName}}", pluginName);
             this.replaceFileContent(settingsGradlePath, "{{pluginName}}", pluginName);
         });
@@ -369,27 +351,12 @@ class AndroidPluginBuildService {
         const gradleWrapperPropertiesPath = path.join(pluginTempDir, "gradle", "wrapper", "gradle-wrapper.properties");
         this.replaceFileContent(gradleWrapperPropertiesPath, gradleVersionPlaceholder, gradleVersion);
     }
-    replaceGradleAndroidPluginVersion(buildGradlePath, version) {
-        const gradleAndroidPluginVersionPlaceholder = "{{runtimeAndroidPluginVersion}}";
-        const gradleAndroidPluginVersion = version || constants_1.AndroidBuildDefaults.GradleAndroidPluginVersion;
-        this.replaceFileContent(buildGradlePath, gradleAndroidPluginVersionPlaceholder, gradleAndroidPluginVersion);
-    }
     replaceFileContent(filePath, content, replacement) {
         const fileContent = this.$fs.readText(filePath);
         const contentRegex = new RegExp(content, "g");
         const replacedFileContent = fileContent.replace(contentRegex, replacement);
         this.$fs.writeFile(filePath, replacedFileContent);
     }
-    addCompileDependencies(platformsAndroidDirPath, buildGradlePath) {
-        const includeGradlePath = path.join(platformsAndroidDirPath, constants_1.INCLUDE_GRADLE_NAME);
-        if (this.$fs.exists(includeGradlePath)) {
-            const includeGradleContent = this.$fs.readText(includeGradlePath);
-            const compileDependencies = this.getIncludeGradleCompileDependenciesScope(includeGradleContent);
-            if (compileDependencies.length) {
-                this.$fs.appendFile(buildGradlePath, "\n" + compileDependencies.join("\n"));
-            }
-        }
-    }
     copyAar(shortPluginName, pluginTempDir, aarOutputDir) {
         const finalAarName = `${shortPluginName}-release.aar`;
         const pathToBuiltAar = path.join(pluginTempDir, "build", "outputs", "aar", finalAarName);

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

@@ -126,8 +126,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                             `${constants.APP_FOLDER_NAME}-${buildMode}${constants.APK_EXTENSION_NAME}`,
                         ],
                         regexes: [
-                            new RegExp(`${constants.APP_FOLDER_NAME}-.*-(${constants_1.Configurations.Debug}|${constants_1.Configurations.Release})${constants.APK_EXTENSION_NAME}`, "i"),
-                            new RegExp(`${packageName}-.*-(${constants_1.Configurations.Debug}|${constants_1.Configurations.Release})${constants.APK_EXTENSION_NAME}`, "i"),
+                            new RegExp(`(${packageName}|${constants.APP_FOLDER_NAME})-.*-(${constants_1.Configurations.Debug}|${constants_1.Configurations.Release})(-unsigned)?${constants.APK_EXTENSION_NAME}`, "i"),
                         ],
                     };
                 },

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

@@ -0,0 +1,76 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SPMService = void 0;
+const yok_1 = require("../../common/yok");
+const trapezedev_project_1 = require("@rigor789/trapezedev-project");
+class SPMService {
+    constructor($logger, $projectConfigService, $xcodebuildCommandService, $xcodebuildArgsService) {
+        this.$logger = $logger;
+        this.$projectConfigService = $projectConfigService;
+        this.$xcodebuildCommandService = $xcodebuildCommandService;
+        this.$xcodebuildArgsService = $xcodebuildArgsService;
+    }
+    getSPMPackages(projectData) {
+        const spmPackages = this.$projectConfigService.getValue("ios.experimentalSPMPackages", []);
+        return spmPackages;
+    }
+    hasSPMPackages(projectData) {
+        return this.getSPMPackages(projectData).length > 0;
+    }
+    applySPMPackages(platformData, projectData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spmPackages = this.getSPMPackages(projectData);
+                if (!spmPackages.length) {
+                    this.$logger.trace("SPM: no SPM packages to apply.");
+                    return;
+                }
+                const project = new trapezedev_project_1.MobileProject(platformData.projectRoot, {
+                    ios: {
+                        path: ".",
+                    },
+                    enableAndroid: false,
+                });
+                yield project.load();
+                if (!project.ios) {
+                    this.$logger.trace("SPM: no iOS project found via trapeze.");
+                    return;
+                }
+                for (const pkg of spmPackages) {
+                    this.$logger.trace(`SPM: adding package ${pkg.name} to project.`, pkg);
+                    yield project.ios.addSPMPackage(projectData.projectName, pkg);
+                }
+                yield project.commit();
+                yield this.resolveSPMDependencies(platformData, projectData);
+            }
+            catch (err) {
+                this.$logger.trace("SPM: error applying SPM packages: ", err);
+            }
+        });
+    }
+    resolveSPMDependencies(platformData, projectData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.$xcodebuildCommandService.executeCommand(this.$xcodebuildArgsService
+                .getXcodeProjectArgs(platformData.projectRoot, projectData)
+                .concat([
+                "-destination",
+                "generic/platform=iOS",
+                "-resolvePackageDependencies",
+            ]), {
+                cwd: projectData.projectDir,
+                message: "Resolving SPM dependencies...",
+            });
+        });
+    }
+}
+exports.SPMService = SPMService;
+yok_1.injector.register("spmService", SPMService);

package/lib/services/ios/xcodebuild-args-service.js

@@ -17,11 +17,6 @@ const yok_1 = require("../../common/yok");
 const _ = require("lodash");
 const DevicePlatformSdkName = "iphoneos";
 const SimulatorPlatformSdkName = "iphonesimulator";
-var ProductArgs;
-(function (ProductArgs) {
-    ProductArgs["target"] = "target";
-    ProductArgs["scheme"] = "scheme";
-})(ProductArgs || (ProductArgs = {}));
 class XcodebuildArgsService {
     constructor($devicePlatformsConstants, $devicesService, $fs, $iOSWatchAppService, $logger) {
         this.$devicePlatformsConstants = $devicePlatformsConstants;
@@ -33,9 +28,7 @@ class XcodebuildArgsService {
     getBuildForSimulatorArgs(platformData, projectData, buildConfig) {
         return __awaiter(this, void 0, void 0, function* () {
             let args = yield this.getArchitecturesArgs(buildConfig);
-            let productType;
             if (this.$iOSWatchAppService.hasWatchApp(platformData, projectData)) {
-                productType = ProductArgs.scheme;
                 args = args.concat(["CODE_SIGNING_ALLOWED=NO"]);
             }
             else {
@@ -51,7 +44,7 @@ class XcodebuildArgsService {
             ])
                 .concat(this.getBuildCommonArgs(platformData, projectData, SimulatorPlatformSdkName))
                 .concat(this.getBuildLoggingArgs())
-                .concat(this.getXcodeProjectArgs(platformData.projectRoot, projectData, productType));
+                .concat(this.getXcodeProjectArgs(platformData.projectRoot, projectData));
             return args;
         });
     }
@@ -69,7 +62,7 @@ class XcodebuildArgsService {
                 buildConfig.release ? constants_1.Configurations.Release : constants_1.Configurations.Debug,
                 "-allowProvisioningUpdates",
             ]
-                .concat(this.getXcodeProjectArgs(platformData.projectRoot, projectData, ProductArgs.scheme))
+                .concat(this.getXcodeProjectArgs(platformData.projectRoot, projectData))
                 .concat(architectures)
                 .concat(this.getBuildCommonArgs(platformData, projectData, DevicePlatformSdkName))
                 .concat(this.getBuildLoggingArgs());
@@ -88,7 +81,7 @@ class XcodebuildArgsService {
             return args;
         });
     }
-    getXcodeProjectArgs(projectRoot, projectData, product) {
+    getXcodeProjectArgs(projectRoot, projectData) {
         const xcworkspacePath = path.join(projectRoot, `${projectData.projectName}.xcworkspace`);
         if (this.$fs.exists(xcworkspacePath)) {
             return [
@@ -99,12 +92,7 @@ class XcodebuildArgsService {
             ];
         }
         const xcodeprojPath = path.join(projectRoot, `${projectData.projectName}.xcodeproj`);
-        return [
-            "-project",
-            xcodeprojPath,
-            product ? "-" + product : "-target",
-            projectData.projectName,
-        ];
+        return ["-project", xcodeprojPath, "-scheme", projectData.projectName];
     }
     getBuildLoggingArgs() {
         return this.$logger.getLevel() === "INFO" ? ["-quiet"] : [];

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

@@ -36,7 +36,7 @@ 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) {
+    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) {
         super($fs, $projectDataService);
         this.$childProcess = $childProcess;
         this.$cocoapodsService = $cocoapodsService;
@@ -60,6 +60,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$iOSNativeTargetService = $iOSNativeTargetService;
         this.$sysInfo = $sysInfo;
         this.$tempService = $tempService;
+        this.$spmService = $spmService;
         this._platformsDirCache = null;
         this._platformData = null;
     }
@@ -504,6 +505,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                 yield this.$cocoapodsService.executePodInstall(platformData.projectRoot, this.$xcprojService.getXcodeprojPath(projectData, platformData.projectRoot));
                 yield this.$cocoapodsService.mergePodXcconfigFile(projectData, platformData, opts);
             }
+            yield this.$spmService.applySPMPackages(platformData, projectData);
             const pbxProjPath = this.getPbxProjPath(projectData);
             this.$iOSExtensionsService.removeExtensions({ pbxProjPath });
             yield this.addExtensions(projectData, pluginsData);

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

@@ -198,7 +198,9 @@ class ProjectChangesService {
     getProjectFileStrippedHash(projectDir, platformData) {
         const projectFilePath = path.join(projectDir, constants_1.PACKAGE_JSON_FILE_NAME);
         const projectFileContents = this.$fs.readJson(projectFilePath);
-        return (0, helpers_1.getHash)(JSON.stringify(projectFileContents));
+        const relevantProperties = ["dependencies"];
+        const projectFileStrippedContents = _.pick(projectFileContents, relevantProperties);
+        return (0, helpers_1.getHash)(JSON.stringify(projectFileStrippedContents));
     }
     isProjectFileChanged(projectDir, platformData) {
         const projectFileStrippedContentsHash = this.getProjectFileStrippedHash(projectDir, platformData);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "8.4.0",
+  "version": "8.5.0-dev.0",
   "author": "NativeScript <support@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -60,6 +60,7 @@
     "@nativescript/doctor": "2.0.9",
     "@nativescript/schematics-executor": "0.0.2",
     "@rigor789/resolve-package-path": "^1.0.5",
+    "@rigor789/trapezedev-project": "^7.1.0",
     "axios": "^0.21.1",
     "byline": "5.0.0",
     "chalk": "4.1.0",

package/vendor/gradle-plugin/build.gradle

@@ -7,38 +7,72 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 
-buildscript {
-    def getDepPlatformDir = { dep ->
-        file("${project.ext.USER_PROJECT_ROOT}/${project.ext.PLATFORMS_ANDROID}/${dep.directory}/$PLATFORMS_ANDROID")
-    }
-    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "1.6.0" }
-    def kotlinVersion = computeKotlinVersion()
-    repositories {
-        google()
-        jcenter()
+def loadPropertyFile = { path ->
+    try {
+        if(project.hasProperty("loadedProperties_${path}")) {
+            logger.info "\t + gradle properties already loaded. SKIPPING"
+        } else {
+            logger.info "\t + trying to load gradle properties from \"$path\""
+
+            Properties properties = new Properties()
+            properties.load(new FileInputStream("$path"))
+            properties.each { prop ->
+                logger.info "\t + [$path] setting ${prop.key} = ${prop.value}"
+                project.ext.set(prop.key, prop.value)
+            }
+            project.ext.set("loadedProperties_${path}", true)
+            
+            outLogger.withStyle(Style.SuccessHeader).println "\t + loaded gradle properties from \"$path\""
+        }
+    } catch(Exception ex) {
+        logger.warn "\t + failed to load gradle properties from \"$path\". Error is: ${ex.getMessage()}"
     }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:{{runtimeAndroidPluginVersion}}'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+}
+
+buildscript {
+    def GRADLE_PROPERTIES_FILENAME = "gradle.properties"
 
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+    def getFile = { dir, filename ->
+        File file = new File("$dir$File.separator$filename")
+        file?.exists() ? file : null
     }
 
-    // Set up styled logger
-    project.ext.getDepPlatformDir = getDepPlatformDir
-    project.ext.outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
+    def getPropertyFile = { dir ->
+        return getFile(dir, GRADLE_PROPERTIES_FILENAME)
+    }
+    def getUserProperties = { dir ->
+        def file = getPropertyFile(dir)
+        if (!file) {
+            return null
+        }
 
-    project.ext.USER_PROJECT_ROOT = "$rootDir/../../.."
-    project.ext.PLATFORMS_ANDROID = "platforms/android"
-    project.ext.PLUGIN_NAME = "{{pluginName}}"
+        Properties properties = new Properties()
+        properties.load(file.newInputStream())
 
-    // 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 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)}
-    project.ext.getAppPath = { ->
+        return properties
+    }
+    def loadPropertyFile = { path ->
+        try {
+            if(project.hasProperty("loadedProperties_${path}")) {
+                logger.info "\t + gradle properties already loaded. SKIPPING"
+            } else {
+                logger.info "\t + trying to load gradle properties from \"$path\""
+
+                Properties properties = new Properties()
+                properties.load(new FileInputStream("$path"))
+                properties.each { prop ->
+                    logger.info "\t + [$path] setting ${prop.key} = ${prop.value}"
+                    project.ext.set(prop.key, prop.value)
+                }
+                project.ext.set("loadedProperties_${path}", true)
+                
+                outLogger.withStyle(Style.SuccessHeader).println "\t + loaded gradle properties from \"$path\""
+            }
+        } catch(Exception ex) {
+            logger.warn "\t + failed to load gradle properties from \"$path\". Error is: ${ex.getMessage()}"
+        }
+    }
+    def getAppPath = { ->
         def relativePathToApp = "app"
         def nsConfigFile = file("$USER_PROJECT_ROOT/nsconfig.json")
         def nsConfig
@@ -59,8 +93,7 @@ buildscript {
 
         return project.ext.appPath
     }
-
-    project.ext.getAppResourcesPath = { ->
+    def getAppResourcesPath = { ->
         def relativePathToAppResources
         def absolutePathToAppResources
         def nsConfigFile = file("$USER_PROJECT_ROOT/nsconfig.json")
@@ -87,6 +120,95 @@ buildscript {
         return absolutePathToAppResources
     }
 
+    def initialize = { ->
+        // set up our logger
+        project.ext.outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
+        outLogger.withStyle(Style.SuccessHeader).println "\t ~initialize"
+
+
+        project.ext.USER_PROJECT_ROOT = "$rootDir/../../.."
+        project.ext.PLATFORMS_ANDROID = "platforms/android"
+        project.ext.PLUGIN_NAME = "{{pluginName}}"
+        
+        def userDir = "$USER_PROJECT_ROOT"
+        rootProject.ext.userDefinedGradleProperties = getUserProperties("${getAppResourcesPath()}/Android")
+
+        loadPropertyFile("$USER_PROJECT_ROOT/${project.ext.PLATFORMS_ANDROID}/gradle.properties")
+        loadPropertyFile("$USER_PROJECT_ROOT/${project.ext.PLATFORMS_ANDROID}/additional_gradle.properties")
+        
+        if (rootProject.hasProperty("userDefinedGradleProperties")) {
+            rootProject.ext.userDefinedGradleProperties.each { entry ->
+                def propertyName = entry.getKey()
+                def propertyValue = entry.getValue()
+                project.ext.set(propertyName, propertyValue)
+            }
+        }
+
+        def getDepPlatformDir = { dep ->
+            file("${project.ext.USER_PROJECT_ROOT}/${project.ext.PLATFORMS_ANDROID}/${dep.directory}/$PLATFORMS_ANDROID")
+        }
+
+        // Set up styled logger
+        project.ext.getDepPlatformDir = getDepPlatformDir
+        project.ext.outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
+
+
+        // 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 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)}.plus([pluginData])
+
+        project.ext.getAppResourcesPath = { ->
+            def relativePathToAppResources
+            def absolutePathToAppResources
+            def nsConfigFile = file("$USER_PROJECT_ROOT/nsconfig.json")
+            def nsConfig
+
+            if (nsConfigFile.exists()) {
+                nsConfig = new JsonSlurper().parseText(nsConfigFile.getText("UTF-8"))
+            }
+
+            if (project.hasProperty("appResourcesPath")) {
+                // when appResourcesPath is passed through -PappResourcesPath=/path/to/App_Resources
+                // the path could be relative or absolute - either case will work
+                relativePathToAppResources = appResourcesPath
+                absolutePathToAppResources = Paths.get(USER_PROJECT_ROOT).resolve(relativePathToAppResources).toAbsolutePath()
+            } else if (nsConfig != null && nsConfig.appResourcesPath != null) {
+                relativePathToAppResources = nsConfig.appResourcesPath
+                absolutePathToAppResources = Paths.get(USER_PROJECT_ROOT).resolve(relativePathToAppResources).toAbsolutePath()
+            } else {
+                absolutePathToAppResources = "${getAppPath()}/App_Resources"
+            }
+
+            project.ext.appResourcesPath = absolutePathToAppResources
+
+            return absolutePathToAppResources
+        }
+
+
+        project.ext.getAppPath = { ->
+            def relativePathToApp = "app"
+            def nsConfigFile = file("$USER_PROJECT_ROOT/nsconfig.json")
+            def nsConfig
+
+            if (nsConfigFile.exists()) {
+                nsConfig = new JsonSlurper().parseText(nsConfigFile.getText("UTF-8"))
+            }
+
+            if (project.hasProperty("appPath")) {
+                // when appPath is passed through -PappPath=/path/to/app
+                // the path could be relative or absolute - either case will work
+                relativePathToApp = appPath
+            } else if (nsConfig != null && nsConfig.appPath != null) {
+                relativePathToApp = nsConfig.appPath
+            }
+
+            project.ext.appPath = Paths.get(USER_PROJECT_ROOT).resolve(relativePathToApp).toAbsolutePath()
+
+            return project.ext.appPath
+        }
+    }
     def applyBuildScriptConfigurations = { ->
         def absolutePathToAppResources = getAppResourcesPath()
         def pathToBuildScriptGradle = "$absolutePathToAppResources/Android/buildscript.gradle"
@@ -112,8 +234,25 @@ buildscript {
             apply from: pathToPluginBuildScriptGradle, to: buildscript
         }
     }
+
+    initialize()
     applyBuildScriptConfigurations()
 
+    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "${ns_default_kotlin_version}" }
+    def computeBuildToolsVersion = { -> project.hasProperty("androidBuildToolsVersion") ? androidBuildToolsVersion : "${NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION}" }
+    def kotlinVersion = computeKotlinVersion()
+    def androidBuildToolsVersion = computeBuildToolsVersion()
+
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:$androidBuildToolsVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath "org.codehaus.groovy:groovy-all:3.0.8"
+    }
+
 }
 
 def pluginDependencies
@@ -156,6 +295,7 @@ android {
         nativescriptDependencies.each { dep ->
             def includeGradlePath = "${getDepPlatformDir(dep)}/include.gradle"
             if (file(includeGradlePath).exists()) {
+                outLogger.withStyle(Style.SuccessHeader).println "\t + applying plugin include.gradle from dependency ${includeGradlePath}"
                 apply from: includeGradlePath
             }
         }
@@ -171,6 +311,10 @@ android {
         versionCode 1
         versionName "1.0"
     }
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
 }
 
 
@@ -187,9 +331,13 @@ def applyBeforePluginGradleConfiguration() {
 task addDependenciesFromNativeScriptPlugins {
     nativescriptDependencies.each { dep ->
         def aarFiles = fileTree(dir: getDepPlatformDir(dep), include: ["**/*.aar"])
+        def currentDirname = file(project.buildscript.sourceFile).getParentFile().getName()
         aarFiles.each { aarFile ->
             def length = aarFile.name.length() - 4
             def fileName = aarFile.name[0..<length]
+            if(fileName == currentDirname) {
+                return
+            }
             outLogger.withStyle(Style.SuccessHeader).println "\t + adding aar plugin dependency: " + aarFile.getAbsolutePath()
             project.dependencies.add("implementation", [name: fileName, ext: "aar"])
         }

package/vendor/gradle-plugin/gradle.properties

@@ -1,19 +1,4 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-#org.gradle.parallel=true
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
+# Nativescript CLI plugin build gradle properties
 org.gradle.jvmargs=-Xmx16384M
 
 android.enableJetifier=true

package/lib/common/test/definitions/mocha.d.ts

@@ -1,86 +0,0 @@
-// Type definitions for mocha 1.9.0
-// Project: http://visionmedia.github.io/mocha/
-// Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid/>
-// DefinitelyTyped: https://github.com/borisyankov/DefinitelyTyped
-
-interface Mocha {
-	// Setup mocha with the given setting options.
-	setup(options: MochaSetupOptions): Mocha;
-
-	//Run tests and invoke `fn()` when complete.
-	run(callback?: () => void): void;
-
-	// Set reporter as function
-	reporter(reporter: () => void): Mocha;
-
-	// Set reporter, defaults to "dot"
-	reporter(reporter: string): Mocha;
-
-	// Enable growl support.
-	growl(): Mocha;
-}
-
-interface MochaSetupOptions {
-	//milliseconds to wait before considering a test slow
-	slow?: number;
-
-	// timeout in milliseconds
-	timeout?: number;
-
-	// ui name "bdd", "tdd", "exports" etc
-	ui?: string;
-
-	//array of accepted globals
-	globals?: any[];
-
-	// reporter instance (function or string), defaults to `mocha.reporters.Dot`
-	reporter?: any;
-
-	// bail on the first test failure
-	bail?: Boolean;
-
-	// ignore global leaks
-	ignoreLeaks?: Boolean;
-
-	// grep string or regexp to filter tests with
-	grep?: any;
-}
-
-declare module mocha {
-	interface Done {
-		(error?: Error): void;
-	}
-}
-
-declare var describe: {
-	(description: string, spec: () => void): void;
-	only(description: string, spec: () => void): void;
-	skip(description: string, spec: () => void): void;
-	timeout(ms: number): void;
-};
-
-declare var it: {
-	(expectation: string, assertion?: () => void): void;
-	(expectation: string, assertion?: (done: mocha.Done) => void): void;
-	only(expectation: string, assertion?: () => void): void;
-	only(expectation: string, assertion?: (done: mocha.Done) => void): void;
-	skip(expectation: string, assertion?: () => void): void;
-	skip(expectation: string, assertion?: (done: mocha.Done) => void): void;
-	timeout(ms: number): void;
-};
-
-declare function before(action: () => void): void;
-
-declare function before(action: (done: mocha.Done) => void): void;
-
-declare function after(action: () => void): void;
-
-declare function after(action: (done: mocha.Done) => void): void;
-
-declare function beforeEach(action: () => void): void;
-
-declare function beforeEach(action: (done: mocha.Done) => void): void;
-
-declare function afterEach(action: () => void): void;
-
-declare function afterEach(action: (done: mocha.Done) => void): void;