Merge pull request #3480 from NativeScript/vladimirov/merge-rel-master

chore: Merge release in master

Author: rosen-vladimirov

lib/common

@@ -24,7 +24,10 @@ export const SRC_DIR = "src";
 export const MAIN_DIR = "main";
 export const ASSETS_DIR = "assets";
 export const MANIFEST_FILE_NAME = "AndroidManifest.xml";
+export const APP_GRADLE_FILE_NAME = "app.gradle";
+export const INFO_PLIST_FILE_NAME = "Info.plist";
 export const INCLUDE_GRADLE_NAME = "include.gradle";
+export const BUILD_XCCONFIG_FILE_NAME = "build.xcconfig";
 export const BUILD_DIR = "build";
 export const OUTPUTS_DIR = "outputs";
 export const APK_DIR = "apk";
@@ -33,6 +36,7 @@ export const CONFIG_NS_FILE_NAME = "nsconfig.json";
 export const CONFIG_NS_APP_RESOURCES_ENTRY = "appResourcesPath";
 export const CONFIG_NS_APP_ENTRY = "appPath";
 export const DEPENDENCIES_JSON_NAME = "dependencies.json";
+export const APK_EXTENSION_NAME = ".apk";
 
 export class PackageVersion {
 	static NEXT = "next";
@@ -139,3 +143,8 @@ export const enum BuildStates {
 }
 
 export const NATIVESCRIPT_CLOUD_EXTENSION_NAME = "nativescript-cloud";
+
+/**
+ * Used in ProjectDataService to concatenate the names of the properties inside nativescript key of package.json.
+ */
+export const NATIVESCRIPT_PROPS_INTERNAL_DELIMITER = "**|__**";

lib/constants.ts

@@ -698,23 +698,17 @@ interface IVersionsService {
 	 */
 	getRuntimesVersions(): Promise<IVersionInformation[]>;
 
-	/**
-	 * Checks version information about the nativescript components and prints available updates if any.
-	 */
-	checkComponentsForUpdate(): Promise<void>;
-
 	/**
 	 * Gets versions information about all nativescript components.
 	 * @return {Promise<IVersionInformation[]>} The version information.
 	 */
 	getAllComponentsVersions(): Promise<IVersionInformation[]>;
 
 	/**
-	 * Creates table with versions information.
-	 * @param {IVersionInformation[]} The versions information to push in the table.
-	 * @return {any} The created table.
+	 * Checks version information about the nativescript components and prints versions information.
+	 * @return {Promise<void>}
 	 */
-	createTableWithVersionsInformation(versionsInformation: IVersionInformation[]): any;
+	printVersionsInformation(): Promise<void>;
 }
 
 /**

lib/declarations.d.ts

@@ -260,9 +260,9 @@ interface IPlatformData {
 	projectRoot: string;
 	normalizedPlatformName: string;
 	appDestinationDirectoryPath: string;
-	getDeviceBuildOutputPath(options: IRelease): string;
+	deviceBuildOutputPath: string;
 	emulatorBuildOutputPath?: string;
-	getValidPackageNames(buildOptions: { isReleaseBuild?: boolean, isForDevice?: boolean }): string[];
+	getValidBuildOutputData(buildOptions: IBuildOutputOptions): IValidBuildOutputData;
 	frameworkFilesExtensions: string[];
 	frameworkDirectoriesExtensions?: string[];
 	frameworkDirectoriesNames?: string[];
@@ -273,6 +273,16 @@ interface IPlatformData {
 	fastLivesyncFileExtensions: string[];
 }
 
+interface IValidBuildOutputData {
+	packageNames: string[];
+	regexes?: RegExp[];
+}
+
+interface IBuildOutputOptions {
+	isReleaseBuild?: boolean;
+	isForDevice?: boolean;
+}
+
 interface IPlatformsData {
 	availablePlatforms: any;
 	platformsNames: string[];

lib/definitions/platform.d.ts

@@ -69,6 +69,12 @@ interface IProjectData extends IProjectDir {
 	appResourcesDirectoryPath: string;
 	projectType: string;
 	nsConfig: INsConfig;
+	androidManifestPath: string;
+	appGradlePath: string;
+	gradleFilesDirectoryPath: string;
+	infoPlistPath: string;
+	buildXcconfigPath: string;
+
 	/**
 	 * Initializes project data with the given project directory. If none supplied defaults to --path option or cwd.
 	 * @param {string} projectDir Project root directory.
@@ -142,10 +148,6 @@ interface IBuildForDevice {
 	buildForDevice: boolean;
 }
 
-interface IShouldInstall extends IBuildForDevice, IRelease {
-	
-}
-
 interface INativePrepare {
 	skipNativePrepare: boolean;
 }

lib/definitions/project.d.ts

@@ -43,13 +43,20 @@ export class ProjectData implements IProjectData {
 	public dependencies: any;
 	public devDependencies: IStringDictionary;
 	public projectType: string;
+	public androidManifestPath: string;
+	public infoPlistPath: string;
+	public appGradlePath: string;
+	public gradleFilesDirectoryPath: string;
+	public buildXcconfigPath: string;
 
 	constructor(private $fs: IFileSystem,
 		private $errors: IErrors,
 		private $projectHelper: IProjectHelper,
 		private $staticConfig: IStaticConfig,
 		private $options: IOptions,
-		private $logger: ILogger) { }
+		private $logger: ILogger,
+		private $androidResourcesMigrationService: IAndroidResourcesMigrationService,
+		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants) { }
 
 	public initializeProjectData(projectDir?: string): void {
 		projectDir = projectDir || this.$projectHelper.projectDir;
@@ -108,13 +115,27 @@ export class ProjectData implements IProjectData {
 			this.nsConfig = nsConfig;
 			this.appDirectoryPath = this.getAppDirectoryPath();
 			this.appResourcesDirectoryPath = this.getAppResourcesDirectoryPath();
+			this.androidManifestPath = this.getPathToAndroidManifest(this.appResourcesDirectoryPath);
+			this.gradleFilesDirectoryPath = path.join(this.appResourcesDirectoryPath, this.$devicePlatformsConstants.Android);
+			this.appGradlePath = path.join(this.gradleFilesDirectoryPath, constants.APP_GRADLE_FILE_NAME);
+			this.infoPlistPath = path.join(this.appResourcesDirectoryPath, this.$devicePlatformsConstants.iOS, constants.INFO_PLIST_FILE_NAME);
+			this.buildXcconfigPath = path.join(this.appResourcesDirectoryPath, this.$devicePlatformsConstants.iOS, constants.BUILD_XCCONFIG_FILE_NAME);
 
 			return;
 		}
 
 		this.errorInvalidProject(projectDir);
 	}
 
+	private getPathToAndroidManifest(appResourcesDir: string): string {
+		const androidDirPath = path.join(appResourcesDir, this.$devicePlatformsConstants.Android);
+		const androidManifestDir = this.$androidResourcesMigrationService.hasMigrated(appResourcesDir) ?
+			path.join(androidDirPath, constants.SRC_DIR, constants.MAIN_DIR) :
+			androidDirPath;
+
+		return path.join(androidManifestDir, constants.MANIFEST_FILE_NAME);
+	}
+
 	private errorInvalidProject(projectDir: string): void {
 		const currentDir = path.resolve(".");
 		this.$logger.trace(`Unable to find project. projectDir: ${projectDir}, options.path: ${this.$options.path}, ${currentDir}`);

lib/project-data.ts

@@ -83,18 +83,19 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 				platformProjectService: this,
 				emulatorServices: this.$androidEmulatorServices,
 				projectRoot: projectRoot,
-				getDeviceBuildOutputPath: (options: IRelease): string => {
-					return this.getDeviceBuildOutputPath(path.join(...deviceBuildOutputArr), projectData, options);
-				},
-				getValidPackageNames: (buildOptions: { isReleaseBuild?: boolean, isForDevice?: boolean }): string[] => {
+				deviceBuildOutputPath: path.join(...deviceBuildOutputArr),
+				getValidBuildOutputData: (buildOptions: IBuildOutputOptions): IValidBuildOutputData => {
 					const buildMode = buildOptions.isReleaseBuild ? Configurations.Release.toLowerCase() : Configurations.Debug.toLowerCase();
 
-					return [
-						`${packageName}-${buildMode}.apk`,
-						`${projectData.projectName}-${buildMode}.apk`,
-						`${projectData.projectName}.apk`,
-						`app-${buildMode}.apk`
-					];
+					return {
+						packageNames: [
+							`${packageName}-${buildMode}${constants.APK_EXTENSION_NAME}`,
+							`${projectData.projectName}-${buildMode}${constants.APK_EXTENSION_NAME}`,
+							`${projectData.projectName}${constants.APK_EXTENSION_NAME}`,
+							`${constants.APP_FOLDER_NAME}-${buildMode}${constants.APK_EXTENSION_NAME}`
+						],
+						regexes: [new RegExp(`${constants.APP_FOLDER_NAME}-.*-(${Configurations.Debug}|${Configurations.Release})${constants.APK_EXTENSION_NAME}`, "i"), new RegExp(`${packageName}-.*-(${Configurations.Debug}|${Configurations.Release})${constants.APK_EXTENSION_NAME}`, "i")]
+					};
 				},
 				frameworkFilesExtensions: [".jar", ".dat", ".so"],
 				configurationFileName: constants.MANIFEST_FILE_NAME,
@@ -108,23 +109,6 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		return this._platformData;
 	}
 
-	private getDeviceBuildOutputPath(currentPath: string, projectData: IProjectData, options: IRelease): string {
-		const currentPlatformData: IDictionary<any> = this.$projectDataService.getNSValue(projectData.projectDir, constants.TNS_ANDROID_RUNTIME_NAME);
-		const platformVersion = currentPlatformData && currentPlatformData[constants.VERSION_STRING];
-		const buildType = options.release === true ? "release" : "debug";
-		const normalizedPath = path.join(currentPath, buildType);
-
-		if (semver.valid(platformVersion)) {
-			const gradleAndroidPluginVersion3xx = "4.0.0";
-			const normalizedPlatformVersion = `${semver.major(platformVersion)}.${semver.minor(platformVersion)}.0`;
-			if (semver.lt(normalizedPlatformVersion, gradleAndroidPluginVersion3xx)) {
-				return currentPath;
-			}
-		}
-
-		return normalizedPath;
-	}
-
 	// TODO: Remove prior to the 4.0 CLI release @Pip3r4o @PanayotCankov
 	// Similar to the private method of the same name in platform-service.
 	private getCurrentPlatformVersion(platformData: IPlatformData, projectData: IProjectData): string {
@@ -272,11 +256,9 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		const gradleSettingsFilePath = path.join(this.getPlatformData(projectData).projectRoot, "settings.gradle");
 		shell.sed('-i', /__PROJECT_NAME__/, this.getProjectNameFromId(projectData), gradleSettingsFilePath);
 
-		// will replace applicationId in app/App_Resources/Android/app.gradle if it has not been edited by the user
-		const userAppGradleFilePath = path.join(projectData.appResourcesDirectoryPath, this.$devicePlatformsConstants.Android, "app.gradle");
-
 		try {
-			shell.sed('-i', /__PACKAGE__/, projectData.projectId, userAppGradleFilePath);
+			// will replace applicationId in app/App_Resources/Android/app.gradle if it has not been edited by the user
+			shell.sed('-i', /__PACKAGE__/, projectData.projectId, projectData.appGradlePath);
 		} catch (e) {
 			this.$logger.warn(`\n${e}.\nCheck if you're using an outdated template and update it.`);
 		}
@@ -536,7 +518,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		}
 
 		// Copy include.gradle file
-		const includeGradleFilePath = path.join(pluginPlatformsFolderPath, "include.gradle");
+		const includeGradleFilePath = path.join(pluginPlatformsFolderPath, constants.INCLUDE_GRADLE_NAME);
 		if (this.$fs.exists(includeGradleFilePath)) {
 			shell.cp("-f", includeGradleFilePath, pluginConfigurationDirectoryPath);
 		}

lib/services/android-project-service.ts

@@ -37,7 +37,7 @@ export class AndroidResourcesMigrationService implements IAndroidResourcesMigrat
 		const getDirectories = (files: string[]) => files.filter(isDirectory);
 		const getFiles = (files: string[]) => files.filter((file: string) => !isDirectory(file));
 
-		this.$fs.copyFile(path.join(originalAppResources, "app.gradle"), path.join(appResourcesDestination, "app.gradle"));
+		this.$fs.copyFile(path.join(originalAppResources, constants.APP_GRADLE_FILE_NAME), path.join(appResourcesDestination, constants.APP_GRADLE_FILE_NAME));
 
 		const appResourcesFiles = getAllFiles(originalAppResources);
 		const resourceDirectories = getDirectories(appResourcesFiles);

lib/services/android-resources-migration-service.ts

@@ -47,7 +47,7 @@ class DoctorService implements IDoctorService {
 		}
 
 		try {
-			await this.$versionsService.checkComponentsForUpdate();
+			await this.$versionsService.printVersionsInformation();
 		} catch (err) {
 			this.$logger.error("Cannot get the latest versions information from npm. Please try again later.");
 		}
@@ -71,7 +71,6 @@ class DoctorService implements IDoctorService {
 
 	public async canExecuteLocalBuild(platform?: string): Promise<boolean> {
 		const infos = await doctor.getInfos({ platform });
-		this.printInfosCore(infos);
 
 		const warnings = this.filterInfosByType(infos, constants.WARNING_TYPE_NAME);
 		if (warnings.length > 0) {

lib/services/doctor-service.ts

@@ -1,14 +1,8 @@
 export class InfoService implements IInfoService {
-	constructor(private $versionsService: IVersionsService,
-		private $logger: ILogger) { }
+	constructor(private $versionsService: IVersionsService) { }
 
-	public async printComponentsInfo(): Promise<void> {
-		const allComponentsInfo = await this.$versionsService.getAllComponentsVersions();
-
-		const table: any = this.$versionsService.createTableWithVersionsInformation(allComponentsInfo);
-
-		this.$logger.out("All NativeScript components versions information");
-		this.$logger.out(table.toString());
+	public printComponentsInfo(): Promise<void> {
+		return this.$versionsService.printVersionsInformation();
 	}
 }