mirror of
https://github.com/flutter/flutter
synced 2024-09-13 05:11:45 +00:00
migrate {min,target,compile}SdkVersion to {min,target,compile}Sdk (#141537)
Inspired by #137621.
This commit is contained in:
parent
90ced90f1b
commit
e1d6f7e822
|
@ -37,8 +37,8 @@ android {
|
|||
applicationId "{{androidIdentifier}}"
|
||||
// You can update the following values to match your application needs.
|
||||
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
|
||||
minSdkVersion flutter.minSdkVersion
|
||||
targetSdkVersion flutter.targetSdkVersion
|
||||
minSdk flutter.minSdkVersion
|
||||
targetSdk flutter.targetSdkVersion
|
||||
versionCode flutterVersionCode.toInteger()
|
||||
versionName flutterVersionName
|
||||
}
|
||||
|
|
|
@ -45,8 +45,8 @@ android {
|
|||
applicationId "{{androidIdentifier}}"
|
||||
// You can update the following values to match your application needs.
|
||||
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
|
||||
minSdkVersion flutter.minSdkVersion
|
||||
targetSdkVersion flutter.targetSdkVersion
|
||||
minSdk flutter.minSdkVersion
|
||||
targetSdk flutter.targetSdkVersion
|
||||
versionCode flutterVersionCode.toInteger()
|
||||
versionName flutterVersionName
|
||||
}
|
||||
|
|
|
@ -34,8 +34,8 @@ android {
|
|||
}
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion flutter.minSdkVersion
|
||||
targetSdkVersion flutter.targetSdkVersion
|
||||
minSdk flutter.minSdkVersion
|
||||
targetSdk flutter.targetSdkVersion
|
||||
versionCode flutterVersionCode.toInteger()
|
||||
versionName flutterVersionName
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ android {
|
|||
|
||||
compileSdk {{compileSdkVersion}}
|
||||
defaultConfig {
|
||||
minSdkVersion {{minSdkVersion}}
|
||||
minSdk {{minSdkVersion}}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -17,8 +17,8 @@ android {
|
|||
|
||||
defaultConfig {
|
||||
applicationId "{{androidIdentifier}}.host"
|
||||
minSdkVersion {{minSdkVersion}}
|
||||
targetSdkVersion {{targetSdkVersion}}
|
||||
minSdk {{minSdkVersion}}
|
||||
targetSdk {{targetSdkVersion}}
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
}
|
||||
|
|
|
@ -44,8 +44,8 @@ android {
|
|||
}
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion flutter.minSdkVersion
|
||||
targetSdkVersion flutter.targetSdkVersion
|
||||
minSdk flutter.minSdkVersion
|
||||
targetSdk flutter.targetSdkVersion
|
||||
versionCode flutterVersionCode.toInteger()
|
||||
versionName flutterVersionName
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ android {
|
|||
}
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion {{minSdkVersion}}
|
||||
minSdk {{minSdkVersion}}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
|
|
@ -46,7 +46,7 @@ android {
|
|||
}
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion {{minSdkVersion}}
|
||||
minSdk {{minSdkVersion}}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
|
|
@ -60,6 +60,6 @@ android {
|
|||
}
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion {{minSdkVersion}}
|
||||
minSdk {{minSdkVersion}}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2889,7 +2889,8 @@ void main() {
|
|||
|
||||
expect(buildContent.contains('compileSdk flutter.compileSdkVersion'), true);
|
||||
expect(buildContent.contains('ndkVersion flutter.ndkVersion'), true);
|
||||
expect(buildContent.contains('targetSdkVersion flutter.targetSdkVersion'), true);
|
||||
expect(buildContent.contains('minSdk flutter.minSdkVersion'), true);
|
||||
expect(buildContent.contains('targetSdk flutter.targetSdkVersion'), true);
|
||||
});
|
||||
|
||||
testUsingContext('Android Java plugin contains namespace', () async {
|
||||
|
|
Loading…
Reference in a new issue