@hot-updater/android-helper 0.25.8 → 0.25.10

package/dist/index.cjs

@@ -35,8 +35,8 @@ let node_os = require("node:os");
 node_os = __toESM(node_os);
 
 //#region src/utils/createGradleLogger.ts
-const createGradleLogger = () => new __hot_updater_cli_tools.BuildLogger({
-	failurePatterns: ["BUILD FAILED"],
+const createGradleLogger = ({ logPrefix }) => new __hot_updater_cli_tools.BuildLogger({
+	logPrefix,
 	importantLogPatterns: [
 		"error:",
 		"Error:",
@@ -55,49 +55,95 @@ const createGradleLogger = () => new __hot_updater_cli_tools.BuildLogger({
 		"Android resource compilation failed",
 		"Duplicate class",
 		"Program type already present",
-		"actionable tasks:"
+		"actionable tasks:",
+		"Deprecated Gradle features were used",
+		":app:configureCMake",
+		":app:buildCMake",
+		":app:compileDebugKotlin",
+		":app:compileReleaseKotlin",
+		":app:compileDebugJavaWithJavac",
+		":app:compileReleaseJavaWithJavac",
+		":app:mergeDebugResources",
+		":app:mergeReleaseResources",
+		":app:processDebugResources",
+		":app:processReleaseResources",
+		":app:packageDebug",
+		":app:packageRelease",
+		":app:assembleDebug",
+		":app:assembleRelease"
 	],
-	progressMapping: [
-		[[
+	progressStages: [
+		[
 			"buildKotlinToolingMetadata",
 			"generateAutolinkingNewArchitectureFiles",
-			"generateCodegenSchemaFromJavaScript"
-		], 5],
-		[[
+			"generateAutolinkingPackageList",
+			"generateCodegenSchemaFromJavaScript",
+			"generateCodegenArtifactsFromSchema",
+			"generateReactNativeEntryPoint"
+		],
+		[
 			"createBundleReleaseJsAndAssets",
 			"bundleReleaseJsAndAssets",
 			"bundleDebugJsAndAssets"
-		], 15],
-		[[
+		],
+		[
 			"generateReleaseResValues",
+			"generateDebugResValues",
 			"generateReleaseResources",
-			"mergeReleaseResources"
-		], 25],
-		[[
+			"generateDebugResources",
+			"mergeReleaseResources",
+			"mergeDebugResources"
+		],
+		[
 			"processReleaseResources",
+			"processDebugResources",
 			"processReleaseManifest",
-			"parseReleaseLocalResources"
-		], 35],
-		[["compileReleaseKotlin", "compileDebugKotlin"], 50],
-		[["compileReleaseJavaWithJavac", "compileDebugJavaWithJavac"], 60],
-		[[
+			"processDebugManifest",
+			"processDebugMainManifest",
+			"parseReleaseLocalResources",
+			"parseDebugLocalResources"
+		],
+		["compileReleaseKotlin", "compileDebugKotlin"],
+		["compileReleaseJavaWithJavac", "compileDebugJavaWithJavac"],
+		[
+			/configureCMake\w+\[/,
+			/buildCMake\w+\[/,
+			"mergeReleaseJniLibFolders",
+			"mergeDebugJniLibFolders",
+			"mergeReleaseNativeLibs",
+			"mergeDebugNativeLibs"
+		],
+		[
+			"desugarReleaseFileDependencies",
+			"desugarDebugFileDependencies",
 			"dexBuilderRelease",
+			"dexBuilderDebug",
 			"mergeDexRelease",
+			"mergeExtDexRelease",
+			"mergeExtDexDebug",
+			"mergeProjectDexRelease",
+			"mergeProjectDexDebug",
+			"mergeLibDexRelease",
+			"mergeLibDexDebug",
+			"mergeDebugGlobalSynthetics",
+			"mergeReleaseGlobalSynthetics",
 			"transformClassesWithDex"
-		], 75],
-		[[
+		],
+		[
 			"compressReleaseAssets",
+			"compressDebugAssets",
 			"optimizeReleaseResources",
-			"mergeReleaseAssets"
-		], 85],
-		[[
+			"mergeReleaseAssets",
+			"mergeDebugAssets"
+		],
+		[
 			"packageRelease",
 			"packageDebug",
 			"assembleRelease",
 			"assembleDebug"
-		], 90],
-		[["bundleRelease", "bundleDebug"], 95],
-		[[/\d+ actionable tasks:/], 100]
+		],
+		["bundleRelease", "bundleDebug"],
+		["BUILD SUCCESSFUL", /\d+ actionable tasks:/]
 	]
 });
 
@@ -132,7 +178,7 @@ const getGradleWrapper = () => process.platform.startsWith("win") ? "gradlew.bat
 /**
 * Run gradle build with specified tasks and arguments
 */
-async function runGradle({ tasks, args, androidProjectPath, appModuleName }) {
+async function runGradle({ tasks, logPrefix, args, androidProjectPath, appModuleName }) {
 	const gradleArgs = getTaskNames(appModuleName, tasks);
 	gradleArgs.push("-x", "lint");
 	if (args.extraParams) gradleArgs.push(...args.extraParams);
@@ -143,17 +189,25 @@ Tasks      ${tasks.join(", ")}
 Args       ${gradleArgs.join(" ")}
 `);
 	if ("port" in args && args.port != null) gradleArgs.push(`-PreactNativeDevServerPort=${args.port}`);
-	const logger = createGradleLogger();
-	logger.start(`${appModuleName}`);
+	const logger = createGradleLogger({ logPrefix });
+	await logger.start();
 	try {
-		const process$1 = (0, execa.execa)(getGradleWrapper(), gradleArgs, { cwd: androidProjectPath });
-		for await (const line of process$1) if (line) logger.processLine(line);
+		const process$1 = (0, execa.execa)(getGradleWrapper(), gradleArgs, {
+			cwd: androidProjectPath,
+			all: true
+		});
+		const outputStream = process$1.all ?? process$1.stdout;
+		if (outputStream) await logger.processStream(outputStream);
+		await process$1;
 		logger.stop();
 	} catch (e) {
+		logger.writeError(e);
 		logger.stop("Build failed", false);
 		if (e instanceof execa.ExecaError) __hot_updater_cli_tools.p.log.error(getCleanedErrorMessage(e));
 		else if (e instanceof Error) __hot_updater_cli_tools.p.log.error(e.message);
 		throw new Error("Failed to build the app. See the error above for details from Gradle.");
+	} finally {
+		await logger.close();
 	}
 	return findBuildDirectory({
 		androidProjectPath,
@@ -194,28 +248,15 @@ async function getBuildOutputFilePath({ aab, appModuleName, buildDirectory, vari
 	process.exit(1);
 }
 
-//#endregion
-//#region src/utils/enrichNativeBuildAndroidScheme.ts
-const enrichNativeBuildAndroidScheme = async ({ schemeConfig }) => {
-	return {
-		aab: true,
-		variant: "Release",
-		appModuleName: "app",
-		applicationId: schemeConfig.packageName,
-		...schemeConfig
-	};
-};
-
 //#endregion
 //#region src/buildAndroid.ts
-const buildAndroid = async ({ schemeConfig: _schemeConfig }) => {
+const buildAndroid = async ({ schemeConfig }) => {
 	const androidProjectPath = path.default.join((0, __hot_updater_cli_tools.getCwd)(), "android");
-	const minBundleId = (0, __hot_updater_plugin_core.generateMinBundleId)();
-	const schemeConfig = await enrichNativeBuildAndroidScheme({ schemeConfig: _schemeConfig });
 	return runGradle({
-		args: { extraParams: [`-PMIN_BUNDLE_ID=${minBundleId}`] },
+		args: { extraParams: [`-PMIN_BUNDLE_ID=${(0, __hot_updater_plugin_core.generateMinBundleId)()}`] },
 		appModuleName: schemeConfig.appModuleName,
 		tasks: schemeConfig.aab ? [`bundle${schemeConfig.variant}`] : [`assemble${schemeConfig.variant}`],
+		logPrefix: `android-${schemeConfig.hotUpdaterSchemeName}-build`,
 		androidProjectPath
 	});
 };
@@ -406,19 +447,19 @@ const getAvailableDevicePort = async (startPort = defaultPort) => {
 */
 const tryLaunchEmulator = async (name) => {
 	const port = await getAvailableDevicePort();
-	const loader = __hot_updater_cli_tools.p.spinner();
-	loader.start("Looking for available emulators");
+	const spinner = __hot_updater_cli_tools.p.spinner();
+	spinner.start("Looking for available emulators");
 	const emulators = await getEmulatorNames();
 	const emulatorName = name ?? emulators[0];
 	let deviceId;
 	if (emulators.length > 0) try {
-		loader.message(`Launching emulator "${emulatorName}"`);
-		deviceId = await launchEmulator(emulatorName, port, loader);
-		loader.stop(`Launched ${emulatorName} emulator.`);
+		spinner.message(`Launching emulator "${emulatorName}"`);
+		deviceId = await launchEmulator(emulatorName, port, spinner);
+		spinner.stop(`Launched ${emulatorName} emulator.`);
 	} catch (error) {
-		loader.stop(`Failed to launch ${emulatorName} emulator. ${error.message}`, 1);
+		spinner.error(`Failed to launch ${emulatorName} emulator. ${error.message}`);
 	}
-	else loader.stop("No emulators found as an output of `emulator -list-avds`. Please launch an emulator manually or connect a device", 1);
+	else spinner.error("No emulators found as an output of `emulator -list-avds`. Please launch an emulator manually or connect a device");
 	return deviceId;
 };
 /**
@@ -522,15 +563,15 @@ const tryInstallAppOnDevice = async ({ device, apkPath }) => {
 	];
 	adbArgs.push(apkPath);
 	const adbPath = Device.getAdbPath();
-	const loader = __hot_updater_cli_tools.p.spinner();
-	loader.start(`Installing the app on ${device.readableName} (id: ${deviceId})`);
+	const spinner = __hot_updater_cli_tools.p.spinner();
+	spinner.start(`Installing the app on ${device.readableName} (id: ${deviceId})`);
 	try {
 		await (0, execa.execa)(adbPath, adbArgs);
-		loader.stop(`Installed the app on ${device.readableName} (id: ${deviceId}).`);
+		spinner.stop(`Installed the app on ${device.readableName} (id: ${deviceId}).`);
 	} catch (error) {
 		const errorMessage = error.stdout || error.stderr || "Unknown error";
-		if (typeof errorMessage === "string" && errorMessage.includes("INSTALL_FAILED_INSUFFICIENT_STORAGE")) loader.message("Installation failed due to insufficient storage");
-		loader.stop(`Failed: Installing the app on ${device.readableName} (id: ${deviceId})`, 1);
+		if (typeof errorMessage === "string" && errorMessage.includes("INSTALL_FAILED_INSUFFICIENT_STORAGE")) spinner.message("Installation failed due to insufficient storage");
+		spinner.error(`Failed: Installing the app on ${device.readableName} (id: ${deviceId})`);
 		throw new Error(typeof errorMessage === "string" ? errorMessage : "Installation failed");
 	}
 };
@@ -562,23 +603,22 @@ async function tryLaunchAppOnDevice({ device, port, mainActivity, applicationId,
 	adbArgs.unshift("-s", deviceId);
 	const adbPath = Device.getAdbPath();
 	console.debug(`Running ${adbPath} ${adbArgs.join(" ")}.`);
-	const loader = __hot_updater_cli_tools.p.spinner();
-	loader.start(`Launching the app on ${device.readableName} (id: ${deviceId})`);
+	const spinner = __hot_updater_cli_tools.p.spinner();
+	spinner.start(`Launching the app on ${device.readableName} (id: ${deviceId})`);
 	try {
 		await (0, execa.execa)(adbPath, adbArgs);
-		loader.stop(`Launched the app on ${device.readableName} (id: ${deviceId}) and listening on port ${port}.`);
+		spinner.stop(`Launched the app on ${device.readableName} (id: ${deviceId}) and listening on port ${port}.`);
 	} catch (_error) {
-		loader.stop("Failed to launch the app.", 1);
+		spinner.error("Failed to launch the app.");
 		throw new Error(`Failed to launch the app on ${device.readableName}`);
 	}
 }
 
 //#endregion
 //#region src/runAndroid.ts
-const runAndroid = async ({ schemeConfig: _schemeConfig, runOption }) => {
+const runAndroid = async ({ schemeConfig, runOption }) => {
 	const { interactive, device: deviceOption } = runOption;
 	const androidProjectPath = path.default.join((0, __hot_updater_cli_tools.getCwd)(), "android");
-	const schemeConfig = await enrichNativeBuildAndroidScheme({ schemeConfig: _schemeConfig });
 	if (schemeConfig.aab) {
 		__hot_updater_cli_tools.p.log.error("aab scheme can't not be run");
 		process.exit(1);
@@ -600,6 +640,7 @@ const runAndroid = async ({ schemeConfig: _schemeConfig, runOption }) => {
 	const result = await runGradle({
 		args: { extraParams: [`-PMIN_BUNDLE_ID=${(0, __hot_updater_plugin_core.generateMinBundleId)()}`] },
 		appModuleName: schemeConfig.appModuleName,
+		logPrefix: `android-${schemeConfig.hotUpdaterSchemeName}-run`,
 		tasks: [task],
 		androidProjectPath
 	});
@@ -621,6 +662,20 @@ const runAndroid = async ({ schemeConfig: _schemeConfig, runOption }) => {
 	return result;
 };
 
+//#endregion
+//#region src/utils/enrichNativeBuildAndroidScheme.ts
+const enrichNativeBuildAndroidScheme = async ({ schemeConfig, hotUpdaterSchemeName }) => {
+	return {
+		aab: true,
+		variant: "Release",
+		appModuleName: "app",
+		applicationId: schemeConfig.packageName,
+		...schemeConfig,
+		hotUpdaterSchemeName
+	};
+};
+
 //#endregion
 exports.buildAndroid = buildAndroid;
+exports.enrichNativeBuildAndroidScheme = enrichNativeBuildAndroidScheme;
 exports.runAndroid = runAndroid;

package/dist/index.d.cts

@@ -1,10 +1,26 @@
 import { NativeBuildAndroidScheme, NativeBuildOptions } from "@hot-updater/plugin-core";
 
+//#region src/utils/enrichNativeBuildAndroidScheme.d.ts
+
+/**
+ * Validated scheme filled nullish values with default values.
+ */
+type EnrichedNativeBuildAndroidScheme = Required<NativeBuildAndroidScheme> & {
+  hotUpdaterSchemeName: string;
+};
+declare const enrichNativeBuildAndroidScheme: ({
+  schemeConfig,
+  hotUpdaterSchemeName
+}: {
+  schemeConfig: NativeBuildAndroidScheme;
+  hotUpdaterSchemeName: string;
+}) => Promise<EnrichedNativeBuildAndroidScheme>;
+//#endregion
 //#region src/buildAndroid.d.ts
 declare const buildAndroid: ({
-  schemeConfig: _schemeConfig
+  schemeConfig
 }: {
-  schemeConfig: NativeBuildAndroidScheme;
+  schemeConfig: EnrichedNativeBuildAndroidScheme;
 }) => Promise<{
   buildDirectory: string;
   buildArtifactPath: string;
@@ -20,14 +36,14 @@ interface AndroidNativeRunOptions extends NativeBuildOptions {
 //#endregion
 //#region src/runAndroid.d.ts
 declare const runAndroid: ({
-  schemeConfig: _schemeConfig,
+  schemeConfig,
   runOption
 }: {
-  schemeConfig: NativeBuildAndroidScheme;
+  schemeConfig: EnrichedNativeBuildAndroidScheme;
   runOption: AndroidNativeRunOptions;
 }) => Promise<{
   buildDirectory: string;
   buildArtifactPath: string;
 }>;
 //#endregion
-export { type AndroidNativeRunOptions, buildAndroid, runAndroid };
+export { type AndroidNativeRunOptions, type EnrichedNativeBuildAndroidScheme, buildAndroid, enrichNativeBuildAndroidScheme, runAndroid };

package/dist/index.d.ts

@@ -1,10 +1,26 @@
 import { NativeBuildAndroidScheme, NativeBuildOptions } from "@hot-updater/plugin-core";
 
+//#region src/utils/enrichNativeBuildAndroidScheme.d.ts
+
+/**
+ * Validated scheme filled nullish values with default values.
+ */
+type EnrichedNativeBuildAndroidScheme = Required<NativeBuildAndroidScheme> & {
+  hotUpdaterSchemeName: string;
+};
+declare const enrichNativeBuildAndroidScheme: ({
+  schemeConfig,
+  hotUpdaterSchemeName
+}: {
+  schemeConfig: NativeBuildAndroidScheme;
+  hotUpdaterSchemeName: string;
+}) => Promise<EnrichedNativeBuildAndroidScheme>;
+//#endregion
 //#region src/buildAndroid.d.ts
 declare const buildAndroid: ({
-  schemeConfig: _schemeConfig
+  schemeConfig
 }: {
-  schemeConfig: NativeBuildAndroidScheme;
+  schemeConfig: EnrichedNativeBuildAndroidScheme;
 }) => Promise<{
   buildDirectory: string;
   buildArtifactPath: string;
@@ -20,14 +36,14 @@ interface AndroidNativeRunOptions extends NativeBuildOptions {
 //#endregion
 //#region src/runAndroid.d.ts
 declare const runAndroid: ({
-  schemeConfig: _schemeConfig,
+  schemeConfig,
   runOption
 }: {
-  schemeConfig: NativeBuildAndroidScheme;
+  schemeConfig: EnrichedNativeBuildAndroidScheme;
   runOption: AndroidNativeRunOptions;
 }) => Promise<{
   buildDirectory: string;
   buildArtifactPath: string;
 }>;
 //#endregion
-export { type AndroidNativeRunOptions, buildAndroid, runAndroid };
+export { type AndroidNativeRunOptions, type EnrichedNativeBuildAndroidScheme, buildAndroid, enrichNativeBuildAndroidScheme, runAndroid };

package/dist/index.js

@@ -6,8 +6,8 @@ import fs from "fs";
 import os from "node:os";
 
 //#region src/utils/createGradleLogger.ts
-const createGradleLogger = () => new BuildLogger({
-	failurePatterns: ["BUILD FAILED"],
+const createGradleLogger = ({ logPrefix }) => new BuildLogger({
+	logPrefix,
 	importantLogPatterns: [
 		"error:",
 		"Error:",
@@ -26,49 +26,95 @@ const createGradleLogger = () => new BuildLogger({
 		"Android resource compilation failed",
 		"Duplicate class",
 		"Program type already present",
-		"actionable tasks:"
+		"actionable tasks:",
+		"Deprecated Gradle features were used",
+		":app:configureCMake",
+		":app:buildCMake",
+		":app:compileDebugKotlin",
+		":app:compileReleaseKotlin",
+		":app:compileDebugJavaWithJavac",
+		":app:compileReleaseJavaWithJavac",
+		":app:mergeDebugResources",
+		":app:mergeReleaseResources",
+		":app:processDebugResources",
+		":app:processReleaseResources",
+		":app:packageDebug",
+		":app:packageRelease",
+		":app:assembleDebug",
+		":app:assembleRelease"
 	],
-	progressMapping: [
-		[[
+	progressStages: [
+		[
 			"buildKotlinToolingMetadata",
 			"generateAutolinkingNewArchitectureFiles",
-			"generateCodegenSchemaFromJavaScript"
-		], 5],
-		[[
+			"generateAutolinkingPackageList",
+			"generateCodegenSchemaFromJavaScript",
+			"generateCodegenArtifactsFromSchema",
+			"generateReactNativeEntryPoint"
+		],
+		[
 			"createBundleReleaseJsAndAssets",
 			"bundleReleaseJsAndAssets",
 			"bundleDebugJsAndAssets"
-		], 15],
-		[[
+		],
+		[
 			"generateReleaseResValues",
+			"generateDebugResValues",
 			"generateReleaseResources",
-			"mergeReleaseResources"
-		], 25],
-		[[
+			"generateDebugResources",
+			"mergeReleaseResources",
+			"mergeDebugResources"
+		],
+		[
 			"processReleaseResources",
+			"processDebugResources",
 			"processReleaseManifest",
-			"parseReleaseLocalResources"
-		], 35],
-		[["compileReleaseKotlin", "compileDebugKotlin"], 50],
-		[["compileReleaseJavaWithJavac", "compileDebugJavaWithJavac"], 60],
-		[[
+			"processDebugManifest",
+			"processDebugMainManifest",
+			"parseReleaseLocalResources",
+			"parseDebugLocalResources"
+		],
+		["compileReleaseKotlin", "compileDebugKotlin"],
+		["compileReleaseJavaWithJavac", "compileDebugJavaWithJavac"],
+		[
+			/configureCMake\w+\[/,
+			/buildCMake\w+\[/,
+			"mergeReleaseJniLibFolders",
+			"mergeDebugJniLibFolders",
+			"mergeReleaseNativeLibs",
+			"mergeDebugNativeLibs"
+		],
+		[
+			"desugarReleaseFileDependencies",
+			"desugarDebugFileDependencies",
 			"dexBuilderRelease",
+			"dexBuilderDebug",
 			"mergeDexRelease",
+			"mergeExtDexRelease",
+			"mergeExtDexDebug",
+			"mergeProjectDexRelease",
+			"mergeProjectDexDebug",
+			"mergeLibDexRelease",
+			"mergeLibDexDebug",
+			"mergeDebugGlobalSynthetics",
+			"mergeReleaseGlobalSynthetics",
 			"transformClassesWithDex"
-		], 75],
-		[[
+		],
+		[
 			"compressReleaseAssets",
+			"compressDebugAssets",
 			"optimizeReleaseResources",
-			"mergeReleaseAssets"
-		], 85],
-		[[
+			"mergeReleaseAssets",
+			"mergeDebugAssets"
+		],
+		[
 			"packageRelease",
 			"packageDebug",
 			"assembleRelease",
 			"assembleDebug"
-		], 90],
-		[["bundleRelease", "bundleDebug"], 95],
-		[[/\d+ actionable tasks:/], 100]
+		],
+		["bundleRelease", "bundleDebug"],
+		["BUILD SUCCESSFUL", /\d+ actionable tasks:/]
 	]
 });
 
@@ -103,7 +149,7 @@ const getGradleWrapper = () => process.platform.startsWith("win") ? "gradlew.bat
 /**
 * Run gradle build with specified tasks and arguments
 */
-async function runGradle({ tasks, args, androidProjectPath, appModuleName }) {
+async function runGradle({ tasks, logPrefix, args, androidProjectPath, appModuleName }) {
 	const gradleArgs = getTaskNames(appModuleName, tasks);
 	gradleArgs.push("-x", "lint");
 	if (args.extraParams) gradleArgs.push(...args.extraParams);
@@ -114,17 +160,25 @@ Tasks      ${tasks.join(", ")}
 Args       ${gradleArgs.join(" ")}
 `);
 	if ("port" in args && args.port != null) gradleArgs.push(`-PreactNativeDevServerPort=${args.port}`);
-	const logger = createGradleLogger();
-	logger.start(`${appModuleName}`);
+	const logger = createGradleLogger({ logPrefix });
+	await logger.start();
 	try {
-		const process$1 = execa(getGradleWrapper(), gradleArgs, { cwd: androidProjectPath });
-		for await (const line of process$1) if (line) logger.processLine(line);
+		const process$1 = execa(getGradleWrapper(), gradleArgs, {
+			cwd: androidProjectPath,
+			all: true
+		});
+		const outputStream = process$1.all ?? process$1.stdout;
+		if (outputStream) await logger.processStream(outputStream);
+		await process$1;
 		logger.stop();
 	} catch (e) {
+		logger.writeError(e);
 		logger.stop("Build failed", false);
 		if (e instanceof ExecaError) p.log.error(getCleanedErrorMessage(e));
 		else if (e instanceof Error) p.log.error(e.message);
 		throw new Error("Failed to build the app. See the error above for details from Gradle.");
+	} finally {
+		await logger.close();
 	}
 	return findBuildDirectory({
 		androidProjectPath,
@@ -165,28 +219,15 @@ async function getBuildOutputFilePath({ aab, appModuleName, buildDirectory, vari
 	process.exit(1);
 }
 
-//#endregion
-//#region src/utils/enrichNativeBuildAndroidScheme.ts
-const enrichNativeBuildAndroidScheme = async ({ schemeConfig }) => {
-	return {
-		aab: true,
-		variant: "Release",
-		appModuleName: "app",
-		applicationId: schemeConfig.packageName,
-		...schemeConfig
-	};
-};
-
 //#endregion
 //#region src/buildAndroid.ts
-const buildAndroid = async ({ schemeConfig: _schemeConfig }) => {
+const buildAndroid = async ({ schemeConfig }) => {
 	const androidProjectPath = path.join(getCwd(), "android");
-	const minBundleId = generateMinBundleId();
-	const schemeConfig = await enrichNativeBuildAndroidScheme({ schemeConfig: _schemeConfig });
 	return runGradle({
-		args: { extraParams: [`-PMIN_BUNDLE_ID=${minBundleId}`] },
+		args: { extraParams: [`-PMIN_BUNDLE_ID=${generateMinBundleId()}`] },
 		appModuleName: schemeConfig.appModuleName,
 		tasks: schemeConfig.aab ? [`bundle${schemeConfig.variant}`] : [`assemble${schemeConfig.variant}`],
+		logPrefix: `android-${schemeConfig.hotUpdaterSchemeName}-build`,
 		androidProjectPath
 	});
 };
@@ -377,19 +418,19 @@ const getAvailableDevicePort = async (startPort = defaultPort) => {
 */
 const tryLaunchEmulator = async (name) => {
 	const port = await getAvailableDevicePort();
-	const loader = p.spinner();
-	loader.start("Looking for available emulators");
+	const spinner = p.spinner();
+	spinner.start("Looking for available emulators");
 	const emulators = await getEmulatorNames();
 	const emulatorName = name ?? emulators[0];
 	let deviceId;
 	if (emulators.length > 0) try {
-		loader.message(`Launching emulator "${emulatorName}"`);
-		deviceId = await launchEmulator(emulatorName, port, loader);
-		loader.stop(`Launched ${emulatorName} emulator.`);
+		spinner.message(`Launching emulator "${emulatorName}"`);
+		deviceId = await launchEmulator(emulatorName, port, spinner);
+		spinner.stop(`Launched ${emulatorName} emulator.`);
 	} catch (error) {
-		loader.stop(`Failed to launch ${emulatorName} emulator. ${error.message}`, 1);
+		spinner.error(`Failed to launch ${emulatorName} emulator. ${error.message}`);
 	}
-	else loader.stop("No emulators found as an output of `emulator -list-avds`. Please launch an emulator manually or connect a device", 1);
+	else spinner.error("No emulators found as an output of `emulator -list-avds`. Please launch an emulator manually or connect a device");
 	return deviceId;
 };
 /**
@@ -493,15 +534,15 @@ const tryInstallAppOnDevice = async ({ device, apkPath }) => {
 	];
 	adbArgs.push(apkPath);
 	const adbPath = Device.getAdbPath();
-	const loader = p.spinner();
-	loader.start(`Installing the app on ${device.readableName} (id: ${deviceId})`);
+	const spinner = p.spinner();
+	spinner.start(`Installing the app on ${device.readableName} (id: ${deviceId})`);
 	try {
 		await execa(adbPath, adbArgs);
-		loader.stop(`Installed the app on ${device.readableName} (id: ${deviceId}).`);
+		spinner.stop(`Installed the app on ${device.readableName} (id: ${deviceId}).`);
 	} catch (error) {
 		const errorMessage = error.stdout || error.stderr || "Unknown error";
-		if (typeof errorMessage === "string" && errorMessage.includes("INSTALL_FAILED_INSUFFICIENT_STORAGE")) loader.message("Installation failed due to insufficient storage");
-		loader.stop(`Failed: Installing the app on ${device.readableName} (id: ${deviceId})`, 1);
+		if (typeof errorMessage === "string" && errorMessage.includes("INSTALL_FAILED_INSUFFICIENT_STORAGE")) spinner.message("Installation failed due to insufficient storage");
+		spinner.error(`Failed: Installing the app on ${device.readableName} (id: ${deviceId})`);
 		throw new Error(typeof errorMessage === "string" ? errorMessage : "Installation failed");
 	}
 };
@@ -533,23 +574,22 @@ async function tryLaunchAppOnDevice({ device, port, mainActivity, applicationId,
 	adbArgs.unshift("-s", deviceId);
 	const adbPath = Device.getAdbPath();
 	console.debug(`Running ${adbPath} ${adbArgs.join(" ")}.`);
-	const loader = p.spinner();
-	loader.start(`Launching the app on ${device.readableName} (id: ${deviceId})`);
+	const spinner = p.spinner();
+	spinner.start(`Launching the app on ${device.readableName} (id: ${deviceId})`);
 	try {
 		await execa(adbPath, adbArgs);
-		loader.stop(`Launched the app on ${device.readableName} (id: ${deviceId}) and listening on port ${port}.`);
+		spinner.stop(`Launched the app on ${device.readableName} (id: ${deviceId}) and listening on port ${port}.`);
 	} catch (_error) {
-		loader.stop("Failed to launch the app.", 1);
+		spinner.error("Failed to launch the app.");
 		throw new Error(`Failed to launch the app on ${device.readableName}`);
 	}
 }
 
 //#endregion
 //#region src/runAndroid.ts
-const runAndroid = async ({ schemeConfig: _schemeConfig, runOption }) => {
+const runAndroid = async ({ schemeConfig, runOption }) => {
 	const { interactive, device: deviceOption } = runOption;
 	const androidProjectPath = path.join(getCwd(), "android");
-	const schemeConfig = await enrichNativeBuildAndroidScheme({ schemeConfig: _schemeConfig });
 	if (schemeConfig.aab) {
 		p.log.error("aab scheme can't not be run");
 		process.exit(1);
@@ -571,6 +611,7 @@ const runAndroid = async ({ schemeConfig: _schemeConfig, runOption }) => {
 	const result = await runGradle({
 		args: { extraParams: [`-PMIN_BUNDLE_ID=${generateMinBundleId()}`] },
 		appModuleName: schemeConfig.appModuleName,
+		logPrefix: `android-${schemeConfig.hotUpdaterSchemeName}-run`,
 		tasks: [task],
 		androidProjectPath
 	});
@@ -593,4 +634,17 @@ const runAndroid = async ({ schemeConfig: _schemeConfig, runOption }) => {
 };
 
 //#endregion
-export { buildAndroid, runAndroid };
+//#region src/utils/enrichNativeBuildAndroidScheme.ts
+const enrichNativeBuildAndroidScheme = async ({ schemeConfig, hotUpdaterSchemeName }) => {
+	return {
+		aab: true,
+		variant: "Release",
+		appModuleName: "app",
+		applicationId: schemeConfig.packageName,
+		...schemeConfig,
+		hotUpdaterSchemeName
+	};
+};
+
+//#endregion
+export { buildAndroid, enrichNativeBuildAndroidScheme, runAndroid };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/android-helper",
-  "version": "0.25.8",
+  "version": "0.25.10",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "execa": "9.5.2",
-    "@hot-updater/cli-tools": "0.25.8",
-    "@hot-updater/plugin-core": "0.25.8",
-    "@hot-updater/core": "0.25.8"
+    "@hot-updater/cli-tools": "0.25.10",
+    "@hot-updater/plugin-core": "0.25.10",
+    "@hot-updater/core": "0.25.10"
   },
   "devDependencies": {
     "@types/node": "^20"