github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update app Android gradle scripts to use flutter.versionName and flutter.versionCode (#146604)

Browse Source 
Follow up of #146044 and #141417

Minor change to make Gradle buildscripts shorter.
This commit is contained in:
Bartek Pacia 2024-04-11 14:46:13 +01:00 committed by GitHub
parent 9436b3c1c8
commit 557fbf5167
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/flutter_tools/templates/app_shared/android-java.tmpl/app/build.gradle.tmpl
View File

@ -5,24 +5,6 @@ plugins {
id "dev.flutter.flutter-gradle-plugin" id "dev.flutter.flutter-gradle-plugin"
} }
def localProperties = new Properties()
def localPropertiesFile = rootProject.file("local.properties")
if (localPropertiesFile.exists()) {
localPropertiesFile.withReader("UTF-8") { reader ->
localProperties.load(reader)
}
}
def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
if (flutterVersionCode == null) {
flutterVersionCode = "1"
}
def flutterVersionName = localProperties.getProperty("flutter.versionName")
if (flutterVersionName == null) {
flutterVersionName = "1.0"
}
android { android {
namespace = "{{androidIdentifier}}" namespace = "{{androidIdentifier}}"
compileSdk = flutter.compileSdkVersion compileSdk = flutter.compileSdkVersion
@ -40,8 +22,8 @@ android {
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = flutter.minSdkVersion minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger() versionCode = flutter.versionCode
versionName = flutterVersionName versionName = flutter.versionName
} }
buildTypes { buildTypes {

22
packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/app/build.gradle.tmpl
View File

@ -5,24 +5,6 @@ plugins {
id "dev.flutter.flutter-gradle-plugin" id "dev.flutter.flutter-gradle-plugin"
} }
def localProperties = new Properties()
def localPropertiesFile = rootProject.file("local.properties")
if (localPropertiesFile.exists()) {
localPropertiesFile.withReader("UTF-8") { reader ->
localProperties.load(reader)
}
}
def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
if (flutterVersionCode == null) {
flutterVersionCode = "1"
}
def flutterVersionName = localProperties.getProperty("flutter.versionName")
if (flutterVersionName == null) {
flutterVersionName = "1.0"
}
android { android {
namespace = "{{androidIdentifier}}" namespace = "{{androidIdentifier}}"
compileSdk = flutter.compileSdkVersion compileSdk = flutter.compileSdkVersion
@ -40,8 +22,8 @@ android {
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = flutter.minSdkVersion minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger() versionCode = flutter.versionCode
versionName = flutterVersionName versionName = flutter.versionName
} }
buildTypes { buildTypes {