@capacitor/cli 3.3.1 → 3.3.2

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.3.2](https://github.com/ionic-team/capacitor/compare/3.3.1...3.3.2) (2021-11-17)
+
+
+### Bug Fixes
+
+* **cli:** add cordova-plugin-google-analytics to static list ([#5220](https://github.com/ionic-team/capacitor/issues/5220)) ([67a996c](https://github.com/ionic-team/capacitor/commit/67a996c0a6896e32c41ea01822d6435fdd706b84))
+* **cli:** Add plugin to static list if pod has use-frameworks ([#5232](https://github.com/ionic-team/capacitor/issues/5232)) ([8a0518b](https://github.com/ionic-team/capacitor/commit/8a0518be9f6f6a4be4a9f1366cb8dcb191225b9d))
+* **cli:** sync gradle from android folder ([#5233](https://github.com/ionic-team/capacitor/issues/5233)) ([cd779c4](https://github.com/ionic-team/capacitor/commit/cd779c4b6ed4ffc96777be7c94a0af4baca6d6d5))
+
+
+
+
+
 ## [3.3.1](https://github.com/ionic-team/capacitor/compare/3.3.0...3.3.1) (2021-11-05)
 
 

package/dist/android/add.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addAndroid = void 0;
+exports.createLocalProperties = exports.addAndroid = void 0;
 const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
 const os_1 = require("os");
@@ -13,9 +13,6 @@ async function addAndroid(config) {
     await common_1.runTask(`Adding native android project in ${colors_1.default.strong(config.android.platformDir)}`, async () => {
         return template_1.extractTemplate(config.cli.assets.android.platformTemplateArchiveAbs, config.android.platformDirAbs);
     });
-    await common_1.runTask('Syncing Gradle', async () => {
-        return createLocalProperties(config.android.platformDirAbs);
-    });
 }
 exports.addAndroid = addAndroid;
 async function createLocalProperties(platformDir) {
@@ -47,6 +44,9 @@ sdk.dir=${defaultAndroidPath}
         }
     }
 }
+exports.createLocalProperties = createLocalProperties;
 async function gradleSync(platformDir) {
-    await subprocess_1.runCommand(`${platformDir}/gradlew`, []);
+    await subprocess_1.runCommand(`./gradlew`, [], {
+        cwd: platformDir,
+    });
 }

package/dist/cordova.js

@@ -388,19 +388,18 @@ function getIncompatibleCordovaPlugins(platform) {
 exports.getIncompatibleCordovaPlugins = getIncompatibleCordovaPlugins;
 function needsStaticPod(plugin, config) {
     var _a, _b, _c, _d;
-    let pluginList = [
-        'phonegap-plugin-push',
-        '@havesource/cordova-plugin-push',
-        'cordova-plugin-firebasex',
-        '@batch.com/cordova-plugin',
-        'onesignal-cordova-plugin',
-    ];
+    let pluginList = ['phonegap-plugin-push', '@batch.com/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);
     }
-    return pluginList.includes(plugin.id);
+    return pluginList.includes(plugin.id) || useFrameworks(plugin);
 }
 exports.needsStaticPod = needsStaticPod;
+function useFrameworks(plugin) {
+    const podspecs = plugin_1.getPlatformElement(plugin, 'ios', 'podspec');
+    const frameworkPods = podspecs.filter((podspec) => podspec.pods.filter((pods) => pods.$ && pods.$['use-frameworks'] === 'true').length > 0);
+    return frameworkPods.length > 0;
+}
 async function getCordovaPreferences(config) {
     var _a, _b, _c, _d, _e;
     const configXml = path_1.join(config.app.rootDir, 'config.xml');

package/dist/tasks/add.js

@@ -56,6 +56,11 @@ async function addCommand(config, selectedPlatformName) {
             await editPlatforms(config, platformName);
             if (await utils_fs_1.pathExists(config.app.webDirAbs)) {
                 await sync_1.sync(config, platformName, false);
+                if (platformName === config.android.name) {
+                    await common_2.runTask('Syncing Gradle', async () => {
+                        return add_1.createLocalProperties(config.android.platformDirAbs);
+                    });
+                }
             }
             else {
                 log_1.logger.warn(`${colors_1.default.success(colors_1.default.strong('sync'))} could not run--missing ${colors_1.default.strong(config.app.webDir)} directory.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "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": "8ff7434e9b775e6acb05efae23771ee1b18e26c9"
+  "gitHead": "3158cd9a293ac79de801c833bb937d2df54e0d96"
 }