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

fix: gradle build tools config (#1293)

Browse Source
This commit is contained in:
Norman Breau 2021-07-26 13:26:42 -03:00 committed by GitHub
parent 5e50c1d611
commit c11fcc10e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
"MIN_SDK_VERSION": 22, "MIN_SDK_VERSION": 22,
"SDK_VERSION": 30, "SDK_VERSION": 30,
"GRADLE_VERSION": "7.1.1", "GRADLE_VERSION": "7.1.1",
"BUILD_TOOLS_VERSION": "30.0.3", "MIN_BUILD_TOOLS_VERSION": "30.0.3",
"AGP_VERSION": "4.2.2", "AGP_VERSION": "4.2.2",
"KOTLIN_VERSION": "1.5.20", "KOTLIN_VERSION": "1.5.20",
"ANDROIDX_APP_COMPAT_VERSION": "1.3.0", "ANDROIDX_APP_COMPAT_VERSION": "1.3.0",

16
framework/cordova.gradle
View File

@ -174,12 +174,22 @@ def doApplyCordovaConfigCustomization() {
cordovaConfig.ANDROIDX_WEBKIT_VERSION = cdvAndroidXWebKitVersion cordovaConfig.ANDROIDX_WEBKIT_VERSION = cdvAndroidXWebKitVersion
} }
// Ensure the latest installed build tools is selected, with or without defined override if (!cordovaConfig.BUILD_TOOLS_VERSION) {
cordovaConfig.LATEST_INSTALLED_BUILD_TOOLS = doFindLatestInstalledBuildTools( cordovaConfig.BUILD_TOOLS_VERSION = doFindLatestInstalledBuildTools(
cordovaConfig.BUILD_TOOLS_VERSION cordovaConfig.MIN_BUILD_TOOLS_VERSION
) )
} }
// Ensure the configured build tools version is at least our declared minimum
def buildToolsVersion = new Version(cordovaConfig.BUILD_TOOLS_VERSION)
if (buildToolsVersion.isLowerThan(cordovaConfig.MIN_BUILD_TOOLS_VERSION)) {
throw new RuntimeException("""
Expected Android Build Tools version >= ${cordovaConfig.MIN_BUILD_TOOLS_VERSION},
but got Android Build Tools version ${cordovaConfig.BUILD_TOOLS_VERSION}. Please use version ${cordovaConfig.MIN_BUILD_TOOLS_VERSION} or later.
""".replaceAll(/\s+/, ' ').trim())
}
}
// Properties exported here are visible to all plugins. // Properties exported here are visible to all plugins.
ext { ext {
def defaultsFilePath = './cdv-gradle-config-defaults.json' def defaultsFilePath = './cdv-gradle-config-defaults.json'

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

@ -189,7 +189,7 @@ android {
abortOnError false abortOnError false
} }
buildToolsVersion cordovaConfig.LATEST_INSTALLED_BUILD_TOOLS buildToolsVersion cordovaConfig.BUILD_TOOLS_VERSION
// This code exists for Crosswalk and other Native APIs. // This code exists for Crosswalk and other Native APIs.
// By default, we multiply the existing version code in the // By default, we multiply the existing version code in the