firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Inspired by #137621.
This commit is contained in:
Bartek Pacia 2024-01-16 19:39:12 +01:00 committed by GitHub
parent 90ced90f1b
commit e1d6f7e822
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
} }

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

@ -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
} }

4
packages/flutter_tools/templates/module/android/deferred_component/build.gradle.tmpl
View File

@ -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
} }

2
packages/flutter_tools/templates/module/android/gradle/build.gradle.tmpl
View File

@ -31,7 +31,7 @@ android {
compileSdk {{compileSdkVersion}} compileSdk {{compileSdkVersion}}
defaultConfig { defaultConfig {
minSdkVersion {{minSdkVersion}} minSdk {{minSdkVersion}}
} }
} }

4
packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/build.gradle.tmpl
View File

@ -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"
} }

4
packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl
View File

@ -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
} }

2
packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl
View File

@ -34,7 +34,7 @@ android {
} }
defaultConfig { defaultConfig {
minSdkVersion {{minSdkVersion}} minSdk {{minSdkVersion}}
} }
dependencies { dependencies {

2
packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl
View File

@ -46,7 +46,7 @@ android {
} }
defaultConfig { defaultConfig {
minSdkVersion {{minSdkVersion}} minSdk {{minSdkVersion}}
} }
dependencies { dependencies {

2
packages/flutter_tools/templates/plugin_ffi/android.tmpl/build.gradle.tmpl
View File

@ -60,6 +60,6 @@ android {
} }
defaultConfig { defaultConfig {
minSdkVersion {{minSdkVersion}} minSdk {{minSdkVersion}}
} }
} }

3
packages/flutter_tools/test/commands.shard/permeable/create_test.dart
View File

@ -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 {