@capacitor/cli 5.6.0 → 5.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Binary file
Binary file
@@ -29,8 +29,15 @@ async function buildAndroid(config, buildOptions) {
29
29
  throw e;
30
30
  }
31
31
  }
32
- const releasePath = (0, path_1.join)(config.android.appDirAbs, 'build', 'outputs', releaseTypeIsAAB ? 'bundle' : 'apk', buildOptions.flavor ? `${flavor}Release` : 'release');
33
- const unsignedReleaseName = `app${config.android.flavor ? `-${config.android.flavor}` : ''}-release${releaseTypeIsAAB ? '' : '-unsigned'}.${releaseType.toLowerCase()}`;
32
+ const releaseDir = releaseTypeIsAAB
33
+ ? flavor !== ''
34
+ ? `${flavor}Release`
35
+ : 'release'
36
+ : flavor !== ''
37
+ ? (0, path_1.join)(flavor, 'release')
38
+ : 'release';
39
+ const releasePath = (0, path_1.join)(config.android.appDirAbs, 'build', 'outputs', releaseTypeIsAAB ? 'bundle' : 'apk', releaseDir);
40
+ const unsignedReleaseName = `app${flavor !== '' ? `-${flavor}` : ''}-release${releaseTypeIsAAB ? '' : '-unsigned'}.${releaseType.toLowerCase()}`;
34
41
  const signedReleaseName = unsignedReleaseName.replace(`-release${releaseTypeIsAAB ? '' : '-unsigned'}.${releaseType.toLowerCase()}`, `-release-signed.${releaseType.toLowerCase()}`);
35
42
  if (buildOptions.signingtype == 'jarsigner') {
36
43
  await signWithJarSigner(config, buildOptions, releasePath, signedReleaseName, unsignedReleaseName);
package/dist/index.js CHANGED
@@ -97,10 +97,11 @@ function runProgram(config) {
97
97
  .option('--keystorealiaspass <keystoreAliasPass>', 'Password for the Key Alias')
98
98
  .addOption(new commander_1.Option('--androidreleasetype <androidreleasetype>', 'Android release type; APK or AAB').choices(['AAB', 'APK']))
99
99
  .addOption(new commander_1.Option('--signing-type <signingtype>', 'Program used to sign apps (default: jarsigner)').choices(['apksigner', 'jarsigner']))
100
- .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { scheme, keystorepath, keystorepass, keystorealias, keystorealiaspass, androidreleasetype, signingType, }) => {
100
+ .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { scheme, flavor, keystorepath, keystorepass, keystorealias, keystorealiaspass, androidreleasetype, signingType, }) => {
101
101
  const { buildCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/build')));
102
102
  await buildCommand(config, platform, {
103
103
  scheme,
104
+ flavor,
104
105
  keystorepath,
105
106
  keystorepass,
106
107
  keystorealias,
@@ -193,11 +193,6 @@ async function copySSLCert(sslCertPaths, rootDir, targetDir) {
193
193
  const validCertPaths = [];
194
194
  for (const sslCertPath of sslCertPaths) {
195
195
  const certAbsFromPath = (0, path_1.join)(rootDir, sslCertPath);
196
- if (!/^.+\.(cer)$/.test(certAbsFromPath)) {
197
- log_1.logger.warn(`Cannot copy file from ${colors_1.default.strong(certAbsFromPath)}\n` +
198
- `The file is not a .cer SSL Certificate file.`);
199
- return;
200
- }
201
196
  if (!(await (0, utils_fs_1.pathExists)(certAbsFromPath))) {
202
197
  log_1.logger.warn(`Cannot copy SSL Certificate file from ${colors_1.default.strong(certAbsFromPath)}\n` +
203
198
  `SSL Certificate does not exist at specified path.`);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@capacitor/cli",
3
- "version": "5.6.0",
3
+ "version": "5.7.1",
4
4
  "description": "Capacitor: Cross-platform apps with JavaScript and the web",
5
5
  "homepage": "https://capacitorjs.com",
6
6
  "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",