@capacitor/cli 3.4.3 → 4.0.1-alpha.0

package/CHANGELOG.md

@@ -3,23 +3,9 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [3.4.3](https://github.com/ionic-team/capacitor/compare/3.4.2...3.4.3) (2022-03-04)
+## [4.0.1-alpha.0](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.1-alpha.0) (2022-03-25)
 
-
-### Bug Fixes
-
-* **cli:** avoid srcFiles is not iterable on kotlinNeededCheck ([#5481](https://github.com/ionic-team/capacitor/issues/5481)) ([3c2b579](https://github.com/ionic-team/capacitor/commit/3c2b579c6edb1fc69d85689b268eb92067b7821b))
-
-
-
-
-
-## [3.4.2](https://github.com/ionic-team/capacitor/compare/3.4.1...3.4.2) (2022-03-03)
-
-
-### Bug Fixes
-
-* **android:** compatibility with cordova kotlin plugins ([#5438](https://github.com/ionic-team/capacitor/issues/5438)) ([55bf004](https://github.com/ionic-team/capacitor/commit/55bf004897b3feb280ab6b6575d2a2c1a0a183e2))
+**Note:** Version bump only for package @capacitor/cli
 
 
 

package/dist/android/update.js

@@ -166,11 +166,7 @@ if (hasProperty('postBuildExtras')) {
 }
 exports.installGradlePlugins = installGradlePlugins;
 async function handleCordovaPluginsGradle(config, cordovaPlugins) {
-    var _a, _b, _c;
     const pluginsGradlePath = path_1.join(config.android.cordovaPluginsDirAbs, 'build.gradle');
-    const kotlinNeeded = await kotlinNeededCheck(config, cordovaPlugins);
-    const isKotlinVersionInVariablesGradle = (await getVariablesGradleFile(config)).includes('kotlin_version');
-    const kotlinVersionString = (_c = (_b = (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.preferences) === null || _b === void 0 ? void 0 : _b.GradlePluginKotlinVersion) !== null && _c !== void 0 ? _c : '1.4.32';
     const frameworksArray = [];
     let prefsArray = [];
     const applyArray = [];
@@ -197,24 +193,10 @@ async function handleCordovaPluginsGradle(config, cordovaPlugins) {
     })
         .join('\n');
     frameworkString = await replaceFrameworkVariables(config, prefsArray, frameworkString);
-    if (kotlinNeeded) {
-        frameworkString += `\n    implementation "androidx.core:core-ktx:$androidxCoreKTXVersion"`;
-        frameworkString += `\n    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"`;
-    }
     const applyString = applyArray.join('\n');
     let buildGradle = await utils_fs_1.readFile(pluginsGradlePath, { encoding: 'utf-8' });
     buildGradle = buildGradle.replace(/(SUB-PROJECT DEPENDENCIES START)[\s\S]*(\/\/ SUB-PROJECT DEPENDENCIES END)/, '$1\n' + frameworkString.concat('\n') + '    $2');
     buildGradle = buildGradle.replace(/(PLUGIN GRADLE EXTENSIONS START)[\s\S]*(\/\/ PLUGIN GRADLE EXTENSIONS END)/, '$1\n' + applyString.concat('\n') + '$2');
-    if (kotlinNeeded) {
-        buildGradle = buildGradle.replace(/(buildscript\s{\n(\t|\s{4})repositories\s{\n((\t{2}|\s{8}).+\n)+(\t|\s{4})}\n(\t|\s{4})dependencies\s{\n(\t{2}|\s{8}).+)\n((\t|\s{4})}\n}\n)/, `$1\n        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:` +
-            (isKotlinVersionInVariablesGradle
-                ? '$kotlin_version'
-                : kotlinVersionString) +
-            `"\n$8`);
-        buildGradle = buildGradle.replace(/(ext\s{)/, `$1\n    kotlin_version = project.hasProperty('kotlin_version') ? rootProject.ext.kotlin_version : '${kotlinVersionString}'\n    androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.6.0'`);
-        buildGradle = buildGradle.replace(/(apply\splugin:\s'com\.android\.library')/, `$1\napply plugin: 'kotlin-android'`);
-        buildGradle = buildGradle.replace(/(compileOptions\s{\n((\t{2}|\s{8}).+\n)+(\t|\s{4})})\n(})/, `$1\n    sourceSets {\n        main.java.srcDirs += 'src/main/kotlin'\n    }\n$5`);
-    }
     await utils_fs_1.writeFile(pluginsGradlePath, buildGradle);
     const cordovaVariables = `// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 ext {
@@ -226,27 +208,6 @@ ext {
     await utils_fs_1.writeFile(path_1.join(config.android.cordovaPluginsDirAbs, 'cordova.variables.gradle'), cordovaVariables);
 }
 exports.handleCordovaPluginsGradle = handleCordovaPluginsGradle;
-async function kotlinNeededCheck(config, cordovaPlugins) {
-    var _a, _b;
-    if (((_b = (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.preferences) === null || _b === void 0 ? void 0 : _b.GradlePluginKotlinEnabled) !==
-        'true') {
-        for (const plugin of cordovaPlugins) {
-            const androidPlatform = plugin_1.getPluginPlatform(plugin, platform);
-            const sourceFiles = androidPlatform['source-file'];
-            if (sourceFiles) {
-                for (const srcFile of sourceFiles) {
-                    if (/^.*\.kt$/.test(srcFile['$'].src)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-    else {
-        return true;
-    }
-}
 async function copyPluginsNativeFiles(config, cordovaPlugins) {
     const pluginsPath = path_1.join(config.android.cordovaPluginsDirAbs, 'src', 'main');
     for (const p of cordovaPlugins) {
@@ -296,16 +257,12 @@ async function getPluginsTask(config) {
         return androidPlugins;
     });
 }
-async function getVariablesGradleFile(config) {
+async function replaceFrameworkVariables(config, prefsArray, frameworkString) {
     const variablesFile = path_1.resolve(config.android.platformDirAbs, 'variables.gradle');
     let variablesGradle = '';
     if (await utils_fs_1.pathExists(variablesFile)) {
         variablesGradle = await utils_fs_1.readFile(variablesFile, { encoding: 'utf-8' });
     }
-    return variablesGradle;
-}
-async function replaceFrameworkVariables(config, prefsArray, frameworkString) {
-    const variablesGradle = await getVariablesGradleFile(config);
     prefsArray.map((preference) => {
         if (!variablesGradle.includes(preference.$.name)) {
             frameworkString = frameworkString.replace(new RegExp(('$' + preference.$.name).replace('$', '\\$&'), 'g'), preference.$.default);

package/dist/config.js

@@ -171,7 +171,7 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
     const studioPath = promise_1.lazy(() => determineAndroidStudioPath(cliConfig.os));
     return {
         name,
-        minVersion: '21',
+        minVersion: '22',
         studioPath,
         platformDir,
         platformDirAbs,
@@ -213,7 +213,7 @@ async function loadIOSConfig(rootDir, extConfig) {
     const cordovaPluginsDir = 'capacitor-cordova-ios-plugins';
     return {
         name,
-        minVersion: '12.0',
+        minVersion: '13.0',
         platformDir,
         platformDirAbs,
         scheme,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "3.4.3",
+  "version": "4.0.1-alpha.0",
   "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": "33e9b342790ddedfb654c589ffde18b101d4cd98"
+  "gitHead": "7faec09fd724a0af7436f3d30c83856b7bb5ce51"
 }