github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-31 17:32:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: bump kotlin 1.9.24 & drop kotlin-android-extensions when kotlin >= 1.8.0 (#1543)

Browse Source 
* feat: bump kotlin 1.9.24 & don't apply kotlin-android-extensions when kotlin >= 1.8.0
This commit is contained in:
エリス 2024-05-13 23:32:49 +09:00 committed by GitHub
parent 89a0a72da5
commit c2f315c0ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/cdv-gradle-config-defaults.json
View File

@ -5,7 +5,7 @@
"GRADLE_VERSION": "8.7", "GRADLE_VERSION": "8.7",
"MIN_BUILD_TOOLS_VERSION": "34.0.0", "MIN_BUILD_TOOLS_VERSION": "34.0.0",
"AGP_VERSION": "8.3.0", "AGP_VERSION": "8.3.0",
"KOTLIN_VERSION": "1.7.21", "KOTLIN_VERSION": "1.9.24",
"ANDROIDX_APP_COMPAT_VERSION": "1.6.1", "ANDROIDX_APP_COMPAT_VERSION": "1.6.1",
"ANDROIDX_WEBKIT_VERSION": "1.6.0", "ANDROIDX_WEBKIT_VERSION": "1.6.0",
"ANDROIDX_CORE_SPLASHSCREEN_VERSION": "1.0.0", "ANDROIDX_CORE_SPLASHSCREEN_VERSION": "1.0.0",

4
framework/cordova.gradle
View File

@ -43,6 +43,10 @@ Boolean isVersionValid(version) {
return !(new Version(version)).isEqual('0.0.0') return !(new Version(version)).isEqual('0.0.0')
} }
Boolean isVersionGreaterThanEqual(versionX, versionY) {
return (new Version(versionX)) >= (new Version(versionY))
}
String doFindLatestInstalledBuildTools(String minBuildToolsVersionString) { String doFindLatestInstalledBuildTools(String minBuildToolsVersionString) {
def buildToolsDirContents def buildToolsDirContents
try { try {

4
templates/project/app/build.gradle
View File

@ -21,8 +21,12 @@ apply plugin: 'com.android.application'
if (cordovaConfig.IS_GRADLE_PLUGIN_KOTLIN_ENABLED) { if (cordovaConfig.IS_GRADLE_PLUGIN_KOTLIN_ENABLED) {
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
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' apply plugin: 'kotlin-android-extensions'
} }
}
buildscript { buildscript {
apply from: '../CordovaLib/cordova.gradle' apply from: '../CordovaLib/cordova.gradle'