Skip to content

fix(cli): Don't add kotlin plugin for Cordova plugins #8518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcesarmobile merged 2 commits into from
Jun 24, 2026
+0 −47
Merged

fix(cli): Don't add kotlin plugin for Cordova plugins #8518

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
597ac08
fix(cli): Don't add kotlin plugin for Cordova plugins
jcesarmobile Jun 24, 2026
2eaaf3d
remove unused kotlinVersionString
jcesarmobile Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 0 additions & 47 deletions cli/src/android/update.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,6 @@ if (hasProperty('postBuildExtras')) {

export async function handleCordovaPluginsGradle(config: Config, cordovaPlugins: Plugin[]): Promise<void> {
const pluginsGradlePath = join(config.android.cordovaPluginsDirAbs, 'build.gradle');
const kotlinNeeded = await kotlinNeededCheck(config, cordovaPlugins);
const kotlinVersionString = config.app.extConfig.cordova?.preferences?.GradlePluginKotlinVersion ?? '2.4.0';
const frameworksArray: any[] = [];
let prefsArray: any[] = [];
const applyArray: any[] = [];
Expand Down Expand Up @@ -296,10 +294,6 @@ export async function handleCordovaPluginsGradle(config: 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 readFile(pluginsGradlePath, { encoding: 'utf-8' });
buildGradle = buildGradle.replace(
Expand All @@ -310,28 +304,6 @@ export async function handleCordovaPluginsGradle(config: Config, cordovaPlugins:
/(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:$kotlin_version"\n$8`,
);
buildGradle = buildGradle.replace(
/(ext\s{)/,
`$1\n androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.8.0'`,
);
buildGradle = buildGradle.replace(
/(buildscript\s{)/,
`$1\n ext.kotlin_version = project.hasProperty('kotlin_version') ? rootProject.ext.kotlin_version : '${kotlinVersionString}'`,
);
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 writeFile(pluginsGradlePath, buildGradle);
const cordovaVariables = `// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
ext {
Expand All @@ -343,25 +315,6 @@ ext {
await writeFile(join(config.android.cordovaPluginsDirAbs, 'cordova.variables.gradle'), cordovaVariables);
}

async function kotlinNeededCheck(config: Config, cordovaPlugins: Plugin[]) {
if (config.app.extConfig.cordova?.preferences?.GradlePluginKotlinEnabled !== 'true') {
for (const plugin of cordovaPlugins) {
const androidPlatform = 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: Config, cordovaPlugins: Plugin[]) {
const pluginsPath = join(config.android.cordovaPluginsDirAbs, 'src', 'main');
for (const p of cordovaPlugins) {
Expand Down
Loading