@capacitor/cli 5.0.0-beta.2 → 5.0.0-beta.3

package/dist/android/update.js

@@ -146,8 +146,8 @@ project(':${getGradlePackageName(p.id)}').projectDir = new File('${relativePlugi
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_11
-      targetCompatibility JavaVersion.VERSION_11
+      sourceCompatibility JavaVersion.VERSION_17
+      targetCompatibility JavaVersion.VERSION_17
   }
 }
 

package/dist/config.js

@@ -353,13 +353,6 @@ const config: CapacitorConfig = ${(0, js_1.formatJSObject)(extConfig)};
 export default config;\n`;
 }
 function checkExternalConfig(config) {
-    var _a, _b;
-    if (typeof config.extConfig.hideLogs !== 'undefined' ||
-        typeof ((_a = config.extConfig.android) === null || _a === void 0 ? void 0 : _a.hideLogs) !== 'undefined' ||
-        typeof ((_b = config.extConfig.ios) === null || _b === void 0 ? void 0 : _b.hideLogs) !== 'undefined') {
-        log_1.logger.warn(`The ${colors_1.default.strong('hideLogs')} configuration option has been deprecated. ` +
-            `Please update to use ${colors_1.default.strong('loggingBehavior')} instead.`);
-    }
     if (typeof config.extConfig.bundledWebRuntime !== 'undefined') {
         let actionMessage = `Can be safely deleted.`;
         if (config.extConfig.bundledWebRuntime === true) {

package/dist/declarations.d.ts

@@ -40,14 +40,6 @@ export interface CapacitorConfig {
      * @default false
      */
     bundledWebRuntime?: boolean;
-    /**
-     * Hide or show the native logs for iOS and Android.
-     *
-     * @since 2.1.0
-     * @deprecated 3.0.0
-     * @default false
-     */
-    hideLogs?: boolean;
     /**
      * The build configuration (as defined by the native app) under which Capacitor
      * will send statements to the log system. This applies to log statements in
@@ -151,16 +143,6 @@ export interface CapacitorConfig {
          * @default false
          */
         webContentsDebuggingEnabled?: boolean;
-        /**
-         * Hide or show the native logs for Android.
-         *
-         * Overrides global `hideLogs` option.
-         *
-         * @since 2.1.0
-         * @deprecated 3.0.0
-         * @default false
-         */
-        hideLogs?: boolean;
         /**
          * The build configuration under which Capacitor will generate logs on Android.
          *
@@ -350,16 +332,6 @@ export interface CapacitorConfig {
          * @since 2.0.0
          */
         allowsLinkPreview?: boolean;
-        /**
-         * Hide or show the native logs for iOS.
-         *
-         * Overrides global `hideLogs` option.
-         *
-         * @since 1.1.0
-         * @deprecated 3.0.0
-         * @default false
-         */
-        hideLogs?: boolean;
         /**
          * The build configuration under which Capacitor will generate logs on iOS.
          *
@@ -574,7 +546,7 @@ export interface PluginsConfig {
      * @since 5.0.0
      */
     FederatedCapacitor?: {
-        shell: FederatedApp;
+        shell: Omit<FederatedApp, 'webDir'>;
         apps: FederatedApp[];
         liveUpdatesKey?: string;
     };

package/dist/tasks/copy.js

@@ -154,16 +154,22 @@ async function copyFederatedWebDirs(config, nativeAbsDir) {
     }
     const federatedConfig = config.app.extConfig.plugins.FederatedCapacitor;
     if (federatedConfig) {
-        if (!isFederatedApp(federatedConfig.shell)) {
+        if (federatedConfig.shell.name === undefined) {
             throw `FederatedCapacitor plugin is present but no valid Shell application is defined in the config.`;
         }
         if (!federatedConfig.apps.every(isFederatedApp)) {
             throw `FederatedCapacitor plugin is present but there is a problem with the apps defined in the config.`;
         }
-        await Promise.all([...federatedConfig.apps, federatedConfig.shell].map(app => {
-            const appDir = (0, path_1.resolve)(config.app.rootDir, app.webDir);
-            return copyWebDir(config, (0, path_1.resolve)(nativeAbsDir, app.name), appDir);
-        }));
+        const copyApps = () => {
+            return federatedConfig.apps.map(app => {
+                const appDir = (0, path_1.resolve)(config.app.rootDir, app.webDir);
+                return copyWebDir(config, (0, path_1.resolve)(nativeAbsDir, app.name), appDir);
+            });
+        };
+        const copyShell = () => {
+            return copyWebDir(config, (0, path_1.resolve)(nativeAbsDir, federatedConfig.shell.name), config.app.webDirAbs);
+        };
+        await Promise.all([...copyApps(), copyShell()]);
     }
 }
 function isFederatedApp(config) {

package/dist/tasks/migrate.js

@@ -49,7 +49,7 @@ const plugins = [
 ];
 const coreVersion = 'next'; // TODO: Update when Capacitor 5 releases
 const pluginVersion = 'next'; // TODO: Update when Capacitor 5 releases
-const gradleVersion = '7.5';
+const gradleVersion = '8.0.2';
 async function migrateCommand(config, noprompt, packagemanager) {
     if (config === null) {
         (0, errors_1.fatal)('Config data missing');
@@ -137,6 +137,10 @@ async function migrateCommand(config, noprompt, packagemanager) {
                 await (0, common_1.runTask)('Remove android.enableJetifier=true from gradle.properties', () => {
                     return updateGradleProperties((0, path_1.join)(config.android.platformDirAbs, 'gradle.properties'));
                 });
+                // Move package from android manifest
+                await (0, common_1.runTask)('Migrating package from Manifest to build.gradle', () => {
+                    return movePackageFromManifestToBuildGradle((0, path_1.join)(config.android.platformDirAbs, 'app', 'src', 'main', 'AndroidManifest.xml'), (0, path_1.join)(config.android.platformDirAbs, 'app', 'build.gradle'));
+                });
                 // Update gradle-wrapper.properties
                 await (0, common_1.runTask)(`Migrating gradle-wrapper.properties by updating gradle version to ${gradleVersion}.`, () => {
                     return updateGradleWrapper((0, path_1.join)(config.android.platformDirAbs, 'gradle', 'wrapper', 'gradle-wrapper.properties'));
@@ -169,6 +173,7 @@ async function migrateCommand(config, noprompt, packagemanager) {
                             androidxBrowserVersion: '1.5.0',
                             androidxMaterialVersion: '1.8.0',
                             androidxExifInterfaceVersion: '1.3.6',
+                            androidxCoreKTXVersion: '1.10.0',
                         };
                         for (const variable of Object.keys(pluginVariables)) {
                             await updateFile(config, variablesPath, `${variable} = '`, `'`, pluginVariables[variable], true);
@@ -407,10 +412,51 @@ async function updateGradleProperties(filename) {
     }
     (0, utils_fs_1.writeFileSync)(filename, linesToKeep, { encoding: 'utf-8' });
 }
+async function movePackageFromManifestToBuildGradle(manifestFilename, buildGradleFilename) {
+    const manifestText = readFile(manifestFilename);
+    const buildGradleText = readFile(buildGradleFilename);
+    if (!manifestText) {
+        log_1.logger.error(`Could not read ${manifestFilename}. Check its permissions and if it exists.`);
+        return;
+    }
+    if (!buildGradleText) {
+        log_1.logger.error(`Could not read ${buildGradleFilename}. Check its permissions and if it exists.`);
+        return;
+    }
+    const namespaceExists = new RegExp(/\s+namespace\s+/).test(buildGradleText);
+    if (namespaceExists) {
+        log_1.logger.error('Found namespace in build.gradle already, skipping migration');
+        return;
+    }
+    let packageName;
+    const manifestRegEx = new RegExp(/<manifest ([^>]*package="(.+)"[^>]*)>/);
+    const manifestResults = manifestRegEx.exec(manifestText);
+    if (manifestResults === null) {
+        log_1.logger.error(`Unable to update Android Manifest. Missing <activity> tag`);
+        return;
+    }
+    else {
+        packageName = manifestResults[2];
+    }
+    let manifestReplaced = manifestText;
+    manifestReplaced = setAllStringIn(manifestText, '<manifest xmlns:android="http://schemas.android.com/apk/res/android"', '>', ``);
+    if (manifestText == manifestReplaced) {
+        log_1.logger.error(`Unable to update Android Manifest: no changes were detected in Android Manifest file`);
+        return;
+    }
+    let buildGradleReplaced = buildGradleText;
+    buildGradleReplaced = setAllStringIn(buildGradleText, 'android {', ' \n', `namespace "${packageName}"\n`);
+    if (buildGradleText == buildGradleReplaced) {
+        log_1.logger.error(`Unable to update buildGradleText: no changes were detected in Android Manifest file`);
+        return;
+    }
+    (0, utils_fs_1.writeFileSync)(manifestFilename, manifestReplaced, 'utf-8');
+    (0, utils_fs_1.writeFileSync)(buildGradleFilename, buildGradleReplaced, 'utf-8');
+}
 async function updateBuildGradle(filename, variablesAndClasspaths) {
     // In build.gradle add dependencies:
-    // classpath 'com.android.tools.build:gradle:7.4.1'
-    // classpath 'com.google.gms:google-services:4.3.13'
+    // classpath 'com.android.tools.build:gradle:8.0.0'
+    // classpath 'com.google.gms:google-services:4.3.15'
     const txt = readFile(filename);
     if (!txt) {
         return;
@@ -431,6 +477,7 @@ async function updateBuildGradle(filename, variablesAndClasspaths) {
             }
         }
     }
+    (0, utils_fs_1.writeFileSync)(filename, replaced, 'utf-8');
 }
 async function updateFile(config, filename, textStart, textEnd, replacement, skipIfNotFound) {
     if (config === null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "5.0.0-beta.2",
+  "version": "5.0.0-beta.3",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -27,7 +27,7 @@
     "cross platform"
   ],
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=16.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/declarations.d.ts",
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "80b59984c0bf07e0c2d2a6310f7a7ff2679606ab"
+  "gitHead": "60ffcc36bc4948876b94f1f7a0470c68b6a7e50f"
 }