feat: bump kotlin 1.9.24 & don't apply kotlin-android-extensions when…

… kotlin >= 1.8.0
apache · May 8, 2024 · 9609409 · 9609409
1 parent 0d14358
commit 9609409
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/framework/cdv-gradle-config-defaults.json b/framework/cdv-gradle-config-defaults.json
@@ -5,7 +5,7 @@
     "GRADLE_VERSION": "7.6",
     "MIN_BUILD_TOOLS_VERSION": "33.0.2",
     "AGP_VERSION": "7.4.2",
-    "KOTLIN_VERSION": "1.8.0",
+    "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
@@ -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
@@ -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 {