Skip to content

Commit 9a2d3e6

Browse files
authored
fix(cli): Don't add kotlin plugin for Cordova plugins (#8518)
1 parent 5e893cb commit 9a2d3e6

1 file changed

Lines changed: 0 additions & 47 deletions

File tree

cli/src/android/update.ts

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,6 @@ if (hasProperty('postBuildExtras')) {
263263

264264
export async function handleCordovaPluginsGradle(config: Config, cordovaPlugins: Plugin[]): Promise<void> {
265265
const pluginsGradlePath = join(config.android.cordovaPluginsDirAbs, 'build.gradle');
266-
const kotlinNeeded = await kotlinNeededCheck(config, cordovaPlugins);
267-
const kotlinVersionString = config.app.extConfig.cordova?.preferences?.GradlePluginKotlinVersion ?? '2.4.0';
268266
const frameworksArray: any[] = [];
269267
let prefsArray: any[] = [];
270268
const applyArray: any[] = [];
@@ -296,10 +294,6 @@ export async function handleCordovaPluginsGradle(config: Config, cordovaPlugins:
296294
})
297295
.join('\n');
298296
frameworkString = await replaceFrameworkVariables(config, prefsArray, frameworkString);
299-
if (kotlinNeeded) {
300-
frameworkString += `\n implementation "androidx.core:core-ktx:$androidxCoreKTXVersion"`;
301-
frameworkString += `\n implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"`;
302-
}
303297
const applyString = applyArray.join('\n');
304298
let buildGradle = await readFile(pluginsGradlePath, { encoding: 'utf-8' });
305299
buildGradle = buildGradle.replace(
@@ -310,28 +304,6 @@ export async function handleCordovaPluginsGradle(config: Config, cordovaPlugins:
310304
/(PLUGIN GRADLE EXTENSIONS START)[\s\S]*(\/\/ PLUGIN GRADLE EXTENSIONS END)/,
311305
'$1\n' + applyString.concat('\n') + '$2',
312306
);
313-
if (kotlinNeeded) {
314-
buildGradle = buildGradle.replace(
315-
/(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)/,
316-
`$1\n classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"\n$8`,
317-
);
318-
buildGradle = buildGradle.replace(
319-
/(ext\s{)/,
320-
`$1\n androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.8.0'`,
321-
);
322-
buildGradle = buildGradle.replace(
323-
/(buildscript\s{)/,
324-
`$1\n ext.kotlin_version = project.hasProperty('kotlin_version') ? rootProject.ext.kotlin_version : '${kotlinVersionString}'`,
325-
);
326-
buildGradle = buildGradle.replace(
327-
/(apply\splugin:\s'com\.android\.library')/,
328-
`$1\napply plugin: 'kotlin-android'`,
329-
);
330-
buildGradle = buildGradle.replace(
331-
/(compileOptions\s{\n((\t{2}|\s{8}).+\n)+(\t|\s{4})})\n(})/,
332-
`$1\n sourceSets {\n main.java.srcDirs += 'src/main/kotlin'\n }\n$5`,
333-
);
334-
}
335307
await writeFile(pluginsGradlePath, buildGradle);
336308
const cordovaVariables = `// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
337309
ext {
@@ -343,25 +315,6 @@ ext {
343315
await writeFile(join(config.android.cordovaPluginsDirAbs, 'cordova.variables.gradle'), cordovaVariables);
344316
}
345317

346-
async function kotlinNeededCheck(config: Config, cordovaPlugins: Plugin[]) {
347-
if (config.app.extConfig.cordova?.preferences?.GradlePluginKotlinEnabled !== 'true') {
348-
for (const plugin of cordovaPlugins) {
349-
const androidPlatform = getPluginPlatform(plugin, platform);
350-
const sourceFiles = androidPlatform['source-file'];
351-
if (sourceFiles) {
352-
for (const srcFile of sourceFiles) {
353-
if (/^.*\.kt$/.test(srcFile['$'].src)) {
354-
return true;
355-
}
356-
}
357-
}
358-
}
359-
return false;
360-
} else {
361-
return true;
362-
}
363-
}
364-
365318
async function copyPluginsNativeFiles(config: Config, cordovaPlugins: Plugin[]) {
366319
const pluginsPath = join(config.android.cordovaPluginsDirAbs, 'src', 'main');
367320
for (const p of cordovaPlugins) {

0 commit comments

Comments
 (0)