@capacitor/cli 5.2.3-nightly-20230724T150520.0 → 5.2.3

package/dist/android/doctor.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.doctorAndroid = void 0;
 const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
-const fs_1 = require("fs");
 const path_1 = require("path");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
@@ -66,10 +65,6 @@ async function checkAndroidManifestData(config, xmlData) {
     if (!manifestNode) {
         return `Missing ${colors_1.default.input('<manifest>')} XML node in ${colors_1.default.strong(config.android.srcMainDir)}`;
     }
-    const packageId = manifestNode.$['package'];
-    if (!packageId) {
-        return `Missing ${colors_1.default.input('<manifest package="">')} attribute in ${colors_1.default.strong(config.android.srcMainDir)}`;
-    }
     const applicationChildNodes = manifestNode.application;
     if (!Array.isArray(manifestNode.application)) {
         return `Missing ${colors_1.default.input('<application>')} XML node as a child node of ${colors_1.default.input('<manifest>')} in ${colors_1.default.strong(config.android.srcMainDir)}`;
@@ -118,37 +113,25 @@ async function checkAndroidManifestData(config, xmlData) {
     if (!mainActivityClassPath) {
         return `Missing ${colors_1.default.input('<activity android:name="">')} attribute for MainActivity class in ${colors_1.default.strong(config.android.srcMainDir)}`;
     }
-    return checkPackage(config, packageId, mainActivityClassPath);
+    return checkPackage(config, mainActivityClassPath);
 }
-async function checkPackage(config, packageId, mainActivityClassPath) {
-    if (mainActivityClassPath.indexOf(packageId) !== 0) {
-        return (`MainActivity ${mainActivityClassPath} is not in manifest package ${colors_1.default.input(packageId)}.\n` + `Please update the packages to be the same.`);
-    }
+async function checkPackage(config, mainActivityClassPath) {
     const appSrcMainJavaDir = (0, path_1.join)(config.android.srcMainDirAbs, 'java');
     if (!(await (0, utils_fs_1.pathExists)(appSrcMainJavaDir))) {
         return `${colors_1.default.strong('java')} directory is missing in ${colors_1.default.strong(appSrcMainJavaDir)}`;
     }
-    let checkPath = appSrcMainJavaDir;
-    const packageParts = packageId.split('.');
-    for (const packagePart of packageParts) {
-        try {
-            (0, fs_1.accessSync)((0, path_1.join)(checkPath, packagePart));
-            checkPath = (0, path_1.join)(checkPath, packagePart);
-        }
-        catch (e) {
-            return (`${colors_1.default.strong(packagePart)} is missing in ${checkPath}.\n` +
-                `Please create a directory structure matching the Package ID ${colors_1.default.input(packageId)} within the ${appSrcMainJavaDir} directory.`);
-        }
-    }
     const mainActivityClassName = mainActivityClassPath.split('.').pop();
-    const mainActivityClassFileName = `${mainActivityClassName}.java`;
-    const mainActivityClassFilePath = (0, path_1.join)(checkPath, mainActivityClassFileName);
-    if (!(await (0, utils_fs_1.pathExists)(mainActivityClassFilePath))) {
-        return `Main activity file (${mainActivityClassFileName}) is missing in ${checkPath}`;
+    const srcFiles = await (0, utils_fs_1.readdirp)(appSrcMainJavaDir, {
+        filter: entry => !entry.stats.isDirectory() &&
+            ['.java', '.kt'].includes((0, path_1.extname)(entry.path)) &&
+            mainActivityClassName === (0, path_1.parse)(entry.path).name,
+    });
+    if (srcFiles.length == 0) {
+        return `Main activity file (${mainActivityClassName}) is missing`;
     }
-    return checkBuildGradle(config, packageId);
+    return checkBuildGradle(config);
 }
-async function checkBuildGradle(config, packageId) {
+async function checkBuildGradle(config) {
     const fileName = 'build.gradle';
     const filePath = (0, path_1.join)(config.android.appDirAbs, fileName);
     if (!(await (0, utils_fs_1.pathExists)(filePath))) {
@@ -156,9 +139,9 @@ async function checkBuildGradle(config, packageId) {
     }
     let fileContent = await (0, utils_fs_1.readFile)(filePath, { encoding: 'utf-8' });
     fileContent = fileContent.replace(/'|"/g, '').replace(/\s+/g, ' ');
-    const searchFor = `applicationId ${packageId}`;
+    const searchFor = `applicationId`;
     if (fileContent.indexOf(searchFor) === -1) {
-        return `${colors_1.default.strong('build.gradle')} file missing ${colors_1.default.input(`applicationId "${packageId}"`)} config in ${filePath}`;
+        return `${colors_1.default.strong('build.gradle')} file missing ${colors_1.default.input(`applicationId`)} config in ${filePath}`;
     }
     return null;
 }

package/dist/config.js

@@ -148,7 +148,7 @@ async function loadCLIConfig(rootDir) {
     };
 }
 async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     const name = 'android';
     const platformDir = (_b = (_a = extConfig.android) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : 'android';
     const platformDirAbs = (0, path_1.resolve)(rootDir, platformDir);
@@ -172,7 +172,10 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
     const buildOptions = {
         keystorePath: (_h = (_g = extConfig.android) === null || _g === void 0 ? void 0 : _g.buildOptions) === null || _h === void 0 ? void 0 : _h.keystorePath,
         keystorePassword: (_k = (_j = extConfig.android) === null || _j === void 0 ? void 0 : _j.buildOptions) === null || _k === void 0 ? void 0 : _k.keystorePassword,
-        releaseType: (_m = (_l = extConfig.android) === null || _l === void 0 ? void 0 : _l.buildOptions) === null || _m === void 0 ? void 0 : _m.releaseType,
+        keystoreAlias: (_m = (_l = extConfig.android) === null || _l === void 0 ? void 0 : _l.buildOptions) === null || _m === void 0 ? void 0 : _m.keystoreAlias,
+        keystoreAliasPassword: (_p = (_o = extConfig.android) === null || _o === void 0 ? void 0 : _o.buildOptions) === null || _p === void 0 ? void 0 : _p.keystoreAliasPassword,
+        signingType: (_r = (_q = extConfig.android) === null || _q === void 0 ? void 0 : _q.buildOptions) === null || _r === void 0 ? void 0 : _r.signingType,
+        releaseType: (_t = (_s = extConfig.android) === null || _s === void 0 ? void 0 : _s.buildOptions) === null || _t === void 0 ? void 0 : _t.releaseType,
     };
     return {
         name,

package/dist/index.js

@@ -97,7 +97,7 @@ function runProgram(config) {
         .option('--keystorealiaspass <keystoreAliasPass>', 'Password for the Key Alias')
         .addOption(new commander_1.Option('--androidreleasetype <androidreleasetype>', 'Android release type; APK or AAB').choices(['AAB', 'APK']))
         .addOption(new commander_1.Option('--signing-type <signingtype>', 'Program used to sign apps (default: jarsigner)').choices(['apksigner', 'jarsigner']))
-        .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { scheme, keystorepath, keystorepass, keystorealias, keystorealiaspass, androidreleasetype, signingtype, }) => {
+        .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { scheme, keystorepath, keystorepass, keystorealias, keystorealiaspass, androidreleasetype, signingType, }) => {
         const { buildCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/build')));
         await buildCommand(config, platform, {
             scheme,
@@ -106,7 +106,7 @@ function runProgram(config) {
             keystorealias,
             keystorealiaspass,
             androidreleasetype,
-            signingtype,
+            signingtype: signingType,
         });
     })));
     commander_1.program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "5.2.3-nightly-20230724T150520.0",
+  "version": "5.2.3",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",