@capacitor/cli 3.3.2 → 3.3.3

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.3.3](https://github.com/ionic-team/capacitor/compare/3.3.2...3.3.3) (2021-12-08)
+
+
+### Bug Fixes
+
+* **android:** restrict android run command to configured flavour ([#5256](https://github.com/ionic-team/capacitor/issues/5256)) ([ba84443](https://github.com/ionic-team/capacitor/commit/ba84443dce9c81e09140def57a60018b527b5bb5))
+* **cli:** Add onesignal-cordova-plugin to the static list again ([#5262](https://github.com/ionic-team/capacitor/issues/5262)) ([e67ca99](https://github.com/ionic-team/capacitor/commit/e67ca9964c5a923d35f5cf41eb802c665563726f))
+
+
+
+
+
 ## [3.3.2](https://github.com/ionic-team/capacitor/compare/3.3.1...3.3.2) (2021-11-17)
 
 

package/dist/android/run.js

@@ -10,8 +10,10 @@ const native_run_1 = require("../util/native-run");
 const subprocess_1 = require("../util/subprocess");
 const debug = debug_1.default('capacitor:android:run');
 async function runAndroid(config, { target: selectedTarget }) {
+    var _a;
     const target = await common_1.promptForPlatformTarget(await native_run_1.getPlatformTargets('android'), selectedTarget);
-    const gradleArgs = ['assembleDebug'];
+    const arg = `assemble${((_a = config.android) === null || _a === void 0 ? void 0 : _a.flavor) || ''}Debug`;
+    const gradleArgs = [arg];
     debug('Invoking ./gradlew with args: %O', gradleArgs);
     await common_1.runTask('Running Gradle build', async () => subprocess_1.runCommand('./gradlew', gradleArgs, {
         cwd: config.android.platformDirAbs,

package/dist/config.js

@@ -148,7 +148,7 @@ async function loadCLIConfig(rootDir) {
     };
 }
 async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     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 = path_1.resolve(rootDir, platformDir);
@@ -160,9 +160,10 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
     const resDir = `${srcMainDir}/res`;
     let apkPath = `${appDir}/build/outputs/apk/`;
     let flavorPrefix = '';
-    if ((_c = extConfig.android) === null || _c === void 0 ? void 0 : _c.flavor) {
-        apkPath = `${apkPath}/${(_d = extConfig.android) === null || _d === void 0 ? void 0 : _d.flavor}`;
-        flavorPrefix = `-${(_e = extConfig.android) === null || _e === void 0 ? void 0 : _e.flavor}`;
+    const flavor = ((_c = extConfig.android) === null || _c === void 0 ? void 0 : _c.flavor) || '';
+    if ((_d = extConfig.android) === null || _d === void 0 ? void 0 : _d.flavor) {
+        apkPath = `${apkPath}/${(_e = extConfig.android) === null || _e === void 0 ? void 0 : _e.flavor}`;
+        flavorPrefix = `-${(_f = extConfig.android) === null || _f === void 0 ? void 0 : _f.flavor}`;
     }
     const apkName = `app${flavorPrefix}-debug.apk`;
     const buildOutputDir = `${apkPath}/debug`;
@@ -191,6 +192,7 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
         apkName,
         buildOutputDir,
         buildOutputDirAbs: path_1.resolve(platformDirAbs, buildOutputDir),
+        flavor,
     };
 }
 async function loadIOSConfig(rootDir, extConfig) {

package/dist/cordova.js

@@ -388,7 +388,11 @@ function getIncompatibleCordovaPlugins(platform) {
 exports.getIncompatibleCordovaPlugins = getIncompatibleCordovaPlugins;
 function needsStaticPod(plugin, config) {
     var _a, _b, _c, _d;
-    let pluginList = ['phonegap-plugin-push', '@batch.com/cordova-plugin'];
+    let pluginList = [
+        'phonegap-plugin-push',
+        '@batch.com/cordova-plugin',
+        'onesignal-cordova-plugin',
+    ];
     if ((_b = (_a = config.app.extConfig) === null || _a === void 0 ? void 0 : _a.cordova) === null || _b === void 0 ? void 0 : _b.staticPlugins) {
         pluginList = pluginList.concat((_d = (_c = config.app.extConfig) === null || _c === void 0 ? void 0 : _c.cordova) === null || _d === void 0 ? void 0 : _d.staticPlugins);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3158cd9a293ac79de801c833bb937d2df54e0d96"
+  "gitHead": "cd8221ed0162454d2ee01dc3bc164de38a81bf43"
 }