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

bartekpacia · web-flow · commit e1d6f7e82216 · 2024-01-16T18:39:12.000Z
Inspired by #137621.
diff --git a/packages/flutter_tools/templates/app_shared/android-java.tmpl/app/build.gradle.tmpl b/packages/flutter_tools/templates/app_shared/android-java.tmpl/app/build.gradle.tmpl
@@ -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
     }
diff --git a/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/app/build.gradle.tmpl b/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/app/build.gradle.tmpl
@@ -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
     }
diff --git a/packages/flutter_tools/templates/module/android/deferred_component/build.gradle.tmpl b/packages/flutter_tools/templates/module/android/deferred_component/build.gradle.tmpl
@@ -34,8 +34,8 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
+        minSdk flutter.minSdkVersion
+        targetSdk flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/packages/flutter_tools/templates/module/android/gradle/build.gradle.tmpl b/packages/flutter_tools/templates/module/android/gradle/build.gradle.tmpl
@@ -31,7 +31,7 @@ android {
 
     compileSdk {{compileSdkVersion}}
     defaultConfig {
-        minSdkVersion {{minSdkVersion}}
+        minSdk {{minSdkVersion}}
     }
 }
 
diff --git a/packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/build.gradle.tmpl
@@ -17,8 +17,8 @@ android {
 
     defaultConfig {
         applicationId "{{androidIdentifier}}.host"
-        minSdkVersion {{minSdkVersion}}
-        targetSdkVersion {{targetSdkVersion}}
+        minSdk {{minSdkVersion}}
+        targetSdk {{targetSdkVersion}}
         versionCode 1
         versionName "1.0"
     }
diff --git a/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl
@@ -44,8 +44,8 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
+        minSdk flutter.minSdkVersion
+        targetSdk flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl
@@ -34,7 +34,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion {{minSdkVersion}}
+        minSdk {{minSdkVersion}}
     }
 
     dependencies {
diff --git a/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl
@@ -46,7 +46,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion {{minSdkVersion}}
+        minSdk {{minSdkVersion}}
     }
 
     dependencies {
diff --git a/packages/flutter_tools/templates/plugin_ffi/android.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/plugin_ffi/android.tmpl/build.gradle.tmpl
@@ -60,6 +60,6 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion {{minSdkVersion}}
+        minSdk {{minSdkVersion}}
     }
 }
diff --git a/packages/flutter_tools/test/commands.shard/permeable/create_test.dart b/packages/flutter_tools/test/commands.shard/permeable/create_test.dart
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ android {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`defaultConfig {`
`37`		`- minSdkVersion flutter.minSdkVersion`
`38`		`- targetSdkVersion flutter.targetSdkVersion`
	`37`	`+ minSdk flutter.minSdkVersion`
	`38`	`+ targetSdk flutter.targetSdkVersion`
`39`	`39`	`versionCode flutterVersionCode.toInteger()`
`40`	`40`	`versionName flutterVersionName`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ android {`
`31`	`31`
`32`	`32`	`compileSdk {{compileSdkVersion}}`
`33`	`33`	`defaultConfig {`
`34`		`- minSdkVersion {{minSdkVersion}}`
	`34`	`+ minSdk {{minSdkVersion}}`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ android {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`defaultConfig {`
`47`		`- minSdkVersion flutter.minSdkVersion`
`48`		`- targetSdkVersion flutter.targetSdkVersion`
	`47`	`+ minSdk flutter.minSdkVersion`
	`48`	`+ targetSdk flutter.targetSdkVersion`
`49`	`49`	`versionCode flutterVersionCode.toInteger()`
`50`	`50`	`versionName flutterVersionName`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ android {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`defaultConfig {`
`37`		`- minSdkVersion {{minSdkVersion}}`
	`37`	`+ minSdk {{minSdkVersion}}`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ android {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`defaultConfig {`
`49`		`- minSdkVersion {{minSdkVersion}}`
	`49`	`+ minSdk {{minSdkVersion}}`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,6 @@ android {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`defaultConfig {`
`63`		`- minSdkVersion {{minSdkVersion}}`
	`63`	`+ minSdk {{minSdkVersion}}`
`64`	`64`	`}`
`65`	`65`	`}`