Unverified Commit e1d6f7e8 authored by Bartek Pacia's avatar Bartek Pacia Committed by GitHub

migrate {min,target,compile}SdkVersion to {min,target,compile}Sdk (#141537)

Inspired by #137621.
parent 90ced90f
...@@ -37,8 +37,8 @@ android { ...@@ -37,8 +37,8 @@ android {
applicationId "{{androidIdentifier}}" applicationId "{{androidIdentifier}}"
// You can update the following values to match your application needs. // 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. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion flutter.minSdkVersion minSdk flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion targetSdk flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
} }
......
...@@ -45,8 +45,8 @@ android { ...@@ -45,8 +45,8 @@ android {
applicationId "{{androidIdentifier}}" applicationId "{{androidIdentifier}}"
// You can update the following values to match your application needs. // 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. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion flutter.minSdkVersion minSdk flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion targetSdk flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
} }
......
...@@ -34,8 +34,8 @@ android { ...@@ -34,8 +34,8 @@ android {
} }
defaultConfig { defaultConfig {
minSdkVersion flutter.minSdkVersion minSdk flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion targetSdk flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
} }
......
...@@ -31,7 +31,7 @@ android { ...@@ -31,7 +31,7 @@ android {
compileSdk {{compileSdkVersion}} compileSdk {{compileSdkVersion}}
defaultConfig { defaultConfig {
minSdkVersion {{minSdkVersion}} minSdk {{minSdkVersion}}
} }
} }
......
...@@ -17,8 +17,8 @@ android { ...@@ -17,8 +17,8 @@ android {
defaultConfig { defaultConfig {
applicationId "{{androidIdentifier}}.host" applicationId "{{androidIdentifier}}.host"
minSdkVersion {{minSdkVersion}} minSdk {{minSdkVersion}}
targetSdkVersion {{targetSdkVersion}} targetSdk {{targetSdkVersion}}
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
} }
......
...@@ -44,8 +44,8 @@ android { ...@@ -44,8 +44,8 @@ android {
} }
defaultConfig { defaultConfig {
minSdkVersion flutter.minSdkVersion minSdk flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion targetSdk flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
} }
......
...@@ -34,7 +34,7 @@ android { ...@@ -34,7 +34,7 @@ android {
} }
defaultConfig { defaultConfig {
minSdkVersion {{minSdkVersion}} minSdk {{minSdkVersion}}
} }
dependencies { dependencies {
......
...@@ -46,7 +46,7 @@ android { ...@@ -46,7 +46,7 @@ android {
} }
defaultConfig { defaultConfig {
minSdkVersion {{minSdkVersion}} minSdk {{minSdkVersion}}
} }
dependencies { dependencies {
......
...@@ -60,6 +60,6 @@ android { ...@@ -60,6 +60,6 @@ android {
} }
defaultConfig { defaultConfig {
minSdkVersion {{minSdkVersion}} minSdk {{minSdkVersion}}
} }
} }
...@@ -2889,7 +2889,8 @@ void main() { ...@@ -2889,7 +2889,8 @@ void main() {
expect(buildContent.contains('compileSdk flutter.compileSdkVersion'), true); expect(buildContent.contains('compileSdk flutter.compileSdkVersion'), true);
expect(buildContent.contains('ndkVersion flutter.ndkVersion'), 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 { testUsingContext('Android Java plugin contains namespace', () async {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment