@capacitor/cli 5.0.0-rc.0 → 5.0.0-rc.2

package/dist/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePlatform = exports.checkPlatformVersions = exports.getAddedPlatforms = exports.getPlatformTargetName = exports.promptForPlatformTarget = exports.promptForPlatform = exports.isValidEnterprisePlatform = exports.getKnownEnterprisePlatforms = exports.isValidCommunityPlatform = exports.getKnownCommunityPlatforms = exports.isValidPlatform = exports.getKnownPlatforms = exports.selectPlatforms = exports.getProjectPlatformDirectory = exports.getCLIVersion = exports.getCoreVersion = exports.getCapacitorPackageVersion = exports.requireCapacitorPackage = exports.getCapacitorPackage = exports.runTask = exports.runPlatformHook = exports.wait = exports.checkAppName = exports.checkAppId = exports.checkAppDir = exports.checkAppConfig = exports.checkCapacitorPlatform = exports.checkPackage = exports.checkWebDir = exports.check = void 0;
+exports.checkJDKMajorVersion = exports.resolvePlatform = exports.checkPlatformVersions = exports.getAddedPlatforms = exports.getPlatformTargetName = exports.promptForPlatformTarget = exports.promptForPlatform = exports.isValidEnterprisePlatform = exports.getKnownEnterprisePlatforms = exports.isValidCommunityPlatform = exports.getKnownCommunityPlatforms = exports.isValidPlatform = exports.getKnownPlatforms = exports.selectPlatforms = exports.getProjectPlatformDirectory = exports.getCLIVersion = exports.getCoreVersion = exports.getCapacitorPackageVersion = exports.requireCapacitorPackage = exports.getCapacitorPackage = exports.runTask = exports.runPlatformHook = exports.wait = exports.checkAppName = exports.checkAppId = exports.checkAppDir = exports.checkAppConfig = exports.checkCapacitorPlatform = exports.checkPackage = exports.checkWebDir = exports.check = void 0;
 const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
 const utils_terminal_1 = require("@ionic/utils-terminal");
@@ -9,6 +9,7 @@ const colors_1 = tslib_1.__importDefault(require("./colors"));
 const errors_1 = require("./errors");
 const log_1 = require("./log");
 const node_1 = require("./util/node");
+const subprocess_1 = require("./util/subprocess");
 async function check(checks) {
     const results = await Promise.all(checks.map(f => f()));
     const errors = results.filter(r => r != null);
@@ -351,3 +352,25 @@ function resolvePlatform(config, platform) {
     return null;
 }
 exports.resolvePlatform = resolvePlatform;
+async function checkJDKMajorVersion() {
+    const string = await (0, subprocess_1.runCommand)('java', ['--version']);
+    const versionRegex = RegExp(/([0-9]+)\.?([0-9]*)\.?([0-9]*)/);
+    const versionMatch = versionRegex.exec(string);
+    if (versionMatch === null) {
+        return -1;
+    }
+    const firstVersionNumber = parseInt(versionMatch[1]);
+    const secondVersionNumber = parseInt(versionMatch[2]);
+    if (typeof firstVersionNumber === 'number' && firstVersionNumber != 1) {
+        return firstVersionNumber;
+    }
+    else if (typeof secondVersionNumber === 'number' &&
+        firstVersionNumber == 1 &&
+        secondVersionNumber < 9) {
+        return secondVersionNumber;
+    }
+    else {
+        return -1;
+    }
+}
+exports.checkJDKMajorVersion = checkJDKMajorVersion;

package/dist/tasks/migrate.js

@@ -58,6 +58,10 @@ async function migrateCommand(config, noprompt, packagemanager) {
     if (capMajor < 4) {
         (0, errors_1.fatal)('Migrate can only be used on capacitor 4 and above, please use the CLI in Capacitor 4 to upgrade to 4 first');
     }
+    const jdkMajor = await (0, common_1.checkJDKMajorVersion)();
+    if (jdkMajor < 17) {
+        log_1.logger.warn('Capacitor 5 requires JDK 17 or higher. Some steps may fail.');
+    }
     const variablesAndClasspaths = await getAndroidVariablesAndClasspaths(config);
     if (!variablesAndClasspaths) {
         (0, errors_1.fatal)('Variable and Classpath info could not be read.');
@@ -174,6 +178,11 @@ async function migrateCommand(config, noprompt, packagemanager) {
                             androidxMaterialVersion: '1.8.0',
                             androidxExifInterfaceVersion: '1.3.6',
                             androidxCoreKTXVersion: '1.10.0',
+                            googleMapsPlayServicesVersion: '18.1.0',
+                            googleMapsUtilsVersion: '3.4.0',
+                            googleMapsKtxVersion: '3.4.0',
+                            googleMapsUtilsKtxVersion: '3.4.0',
+                            kotlinxCoroutinesVersion: '1.6.4',
                         };
                         for (const variable of Object.keys(pluginVariables)) {
                             await updateFile(config, variablesPath, `${variable} = '`, `'`, pluginVariables[variable], true);
@@ -186,17 +195,20 @@ async function migrateCommand(config, noprompt, packagemanager) {
             await (0, common_1.runTask)(`Running cap sync.`, () => {
                 return (0, subprocess_1.getCommandOutput)('npx', ['cap', 'sync']);
             });
-            try {
-                await (0, common_1.runTask)(`Upgrading gradle wrapper files`, () => {
-                    return updateGradleWrapperFiles(config.android.platformDirAbs);
-                });
-            }
-            catch (e) {
-                if (e.includes('EACCES')) {
-                    log_1.logger.error(`gradlew file does not have executable permissions. This can happen if the Android platform was added on a Windows machine. Please run ${colors_1.default.input(`chmod +x ./${config.android.platformDir}/gradlew`)} and ${colors_1.default.input(`cd ${config.android.platformDir} && ./gradlew wrapper --distribution-type all --gradle-version ${gradleVersion} --warning-mode all`)} to update the files manually`);
+            if (allDependencies['@capacitor/android'] &&
+                (0, utils_fs_1.existsSync)(config.android.platformDirAbs)) {
+                try {
+                    await (0, common_1.runTask)(`Upgrading gradle wrapper files`, () => {
+                        return updateGradleWrapperFiles(config.android.platformDirAbs);
+                    });
                 }
-                else {
-                    log_1.logger.error(`gradle wrapper files were not updated`);
+                catch (e) {
+                    if (e.includes('EACCES')) {
+                        log_1.logger.error(`gradlew file does not have executable permissions. This can happen if the Android platform was added on a Windows machine. Please run ${colors_1.default.input(`chmod +x ./${config.android.platformDir}/gradlew`)} and ${colors_1.default.input(`cd ${config.android.platformDir} && ./gradlew wrapper --distribution-type all --gradle-version ${gradleVersion} --warning-mode all`)} to update the files manually`);
+                    }
+                    else {
+                        log_1.logger.error(`gradle wrapper files were not updated`);
+                    }
                 }
             }
             // Write all breaking changes
@@ -263,15 +275,21 @@ async function installLatestLibs(dependencyManager, runInstall, config) {
     }
 }
 async function writeBreakingChanges() {
-    const breaking = ['@capacitor/device'];
+    const breaking = [
+        '@capacitor/camera',
+        '@capacitor/device',
+        '@capacitor/local-notifications',
+        '@capacitor/push-notifications',
+    ];
     const broken = [];
     for (const lib of breaking) {
         if (allDependencies[lib]) {
             broken.push(lib);
         }
     }
+    // TODO - remove "next" from the url once capacitor 5 is final
     if (broken.length > 0) {
-        log_1.logger.info(`IMPORTANT: Review https://capacitorjs.com/docs/updating/5-0#plugins for breaking changes in these plugins that you use: ${broken.join(', ')}.`);
+        log_1.logger.info(`IMPORTANT: Review https://capacitorjs.com/docs/next/updating/5-0#plugins for breaking changes in these plugins that you use: ${broken.join(', ')}.`);
     }
 }
 async function getAndroidVariablesAndClasspaths(config) {
@@ -445,7 +463,7 @@ async function movePackageFromManifestToBuildGradle(manifestFilename, buildGradl
         return;
     }
     let buildGradleReplaced = buildGradleText;
-    buildGradleReplaced = setAllStringIn(buildGradleText, 'android {', ' \n', `namespace "${packageName}"\n`);
+    buildGradleReplaced = setAllStringIn(buildGradleText, 'android {', '\n', `\n    namespace "${packageName}"`);
     if (buildGradleText == buildGradleReplaced) {
         log_1.logger.error(`Unable to update buildGradleText: no changes were detected in Android Manifest file`);
         return;

package/package.json

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