diff --git a/framework/cdv-gradle-config-defaults.json b/framework/cdv-gradle-config-defaults.json index 2895afc7c..46e6513dd 100644 --- a/framework/cdv-gradle-config-defaults.json +++ b/framework/cdv-gradle-config-defaults.json @@ -5,7 +5,7 @@ "GRADLE_VERSION": "8.7", "MIN_BUILD_TOOLS_VERSION": "34.0.0", "AGP_VERSION": "8.3.0", - "KOTLIN_VERSION": "1.7.21", + "KOTLIN_VERSION": "1.9.24", "ANDROIDX_APP_COMPAT_VERSION": "1.6.1", "ANDROIDX_WEBKIT_VERSION": "1.6.0", "ANDROIDX_CORE_SPLASHSCREEN_VERSION": "1.0.0", diff --git a/framework/cordova.gradle b/framework/cordova.gradle index 8ce3b9f6a..9b9783989 100644 --- a/framework/cordova.gradle +++ b/framework/cordova.gradle @@ -43,6 +43,10 @@ Boolean isVersionValid(version) { return !(new Version(version)).isEqual('0.0.0') } +Boolean isVersionGreaterThanEqual(versionX, versionY) { + return (new Version(versionX)) >= (new Version(versionY)) +} + String doFindLatestInstalledBuildTools(String minBuildToolsVersionString) { def buildToolsDirContents try { diff --git a/templates/project/app/build.gradle b/templates/project/app/build.gradle index 4d531aae8..19f97c21f 100644 --- a/templates/project/app/build.gradle +++ b/templates/project/app/build.gradle @@ -21,7 +21,11 @@ apply plugin: 'com.android.application' if (cordovaConfig.IS_GRADLE_PLUGIN_KOTLIN_ENABLED) { apply plugin: 'kotlin-android' - apply plugin: 'kotlin-android-extensions' + + if(!cdvHelpers.isVersionGreaterThanEqual(cordovaConfig.KOTLIN_VERSION, '1.8.0')) { + println "Kotlin version < 1.8.0 detected. Applying kotlin-android-extensions plugin." + apply plugin: 'kotlin-android-extensions' + } } buildscript {