Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
e1d6f7e8
Unverified
Commit
e1d6f7e8
authored
Jan 16, 2024
by
Bartek Pacia
Committed by
GitHub
Jan 16, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
migrate {min,target,compile}SdkVersion to {min,target,compile}Sdk (#141537)
Inspired by #137621.
parent
90ced90f
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
16 additions
and
15 deletions
+16
-15
build.gradle.tmpl
...plates/app_shared/android-java.tmpl/app/build.gradle.tmpl
+2
-2
build.gradle.tmpl
...ates/app_shared/android-kotlin.tmpl/app/build.gradle.tmpl
+2
-2
build.gradle.tmpl
...lates/module/android/deferred_component/build.gradle.tmpl
+2
-2
build.gradle.tmpl
...r_tools/templates/module/android/gradle/build.gradle.tmpl
+1
-1
build.gradle.tmpl
...module/android/host_app_common/app.tmpl/build.gradle.tmpl
+2
-2
build.gradle.tmpl
...roid/library_new_embedding/Flutter.tmpl/build.gradle.tmpl
+2
-2
build.gradle.tmpl
...ools/templates/plugin/android-java.tmpl/build.gradle.tmpl
+1
-1
build.gradle.tmpl
...ls/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl
+1
-1
build.gradle.tmpl
...tools/templates/plugin_ffi/android.tmpl/build.gradle.tmpl
+1
-1
create_test.dart
...tter_tools/test/commands.shard/permeable/create_test.dart
+2
-1
No files found.
packages/flutter_tools/templates/app_shared/android-java.tmpl/app/build.gradle.tmpl
View file @
e1d6f7e8
...
@@ -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.
minSdk
Version
flutter.minSdkVersion
minSdk flutter.minSdkVersion
targetSdk
Version
flutter.targetSdkVersion
targetSdk flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
versionName flutterVersionName
}
}
...
...
packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/app/build.gradle.tmpl
View file @
e1d6f7e8
...
@@ -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.
minSdk
Version
flutter.minSdkVersion
minSdk flutter.minSdkVersion
targetSdk
Version
flutter.targetSdkVersion
targetSdk flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
versionName flutterVersionName
}
}
...
...
packages/flutter_tools/templates/module/android/deferred_component/build.gradle.tmpl
View file @
e1d6f7e8
...
@@ -34,8 +34,8 @@ android {
...
@@ -34,8 +34,8 @@ android {
}
}
defaultConfig {
defaultConfig {
minSdk
Version
flutter.minSdkVersion
minSdk flutter.minSdkVersion
targetSdk
Version
flutter.targetSdkVersion
targetSdk flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
versionName flutterVersionName
}
}
...
...
packages/flutter_tools/templates/module/android/gradle/build.gradle.tmpl
View file @
e1d6f7e8
...
@@ -31,7 +31,7 @@ android {
...
@@ -31,7 +31,7 @@ android {
compileSdk {{compileSdkVersion}}
compileSdk {{compileSdkVersion}}
defaultConfig {
defaultConfig {
minSdk
Version
{{minSdkVersion}}
minSdk {{minSdkVersion}}
}
}
}
}
...
...
packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/build.gradle.tmpl
View file @
e1d6f7e8
...
@@ -17,8 +17,8 @@ android {
...
@@ -17,8 +17,8 @@ android {
defaultConfig {
defaultConfig {
applicationId "{{androidIdentifier}}.host"
applicationId "{{androidIdentifier}}.host"
minSdk
Version
{{minSdkVersion}}
minSdk {{minSdkVersion}}
targetSdk
Version
{{targetSdkVersion}}
targetSdk {{targetSdkVersion}}
versionCode 1
versionCode 1
versionName "1.0"
versionName "1.0"
}
}
...
...
packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl
View file @
e1d6f7e8
...
@@ -44,8 +44,8 @@ android {
...
@@ -44,8 +44,8 @@ android {
}
}
defaultConfig {
defaultConfig {
minSdk
Version
flutter.minSdkVersion
minSdk flutter.minSdkVersion
targetSdk
Version
flutter.targetSdkVersion
targetSdk flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
versionName flutterVersionName
}
}
...
...
packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl
View file @
e1d6f7e8
...
@@ -34,7 +34,7 @@ android {
...
@@ -34,7 +34,7 @@ android {
}
}
defaultConfig {
defaultConfig {
minSdk
Version
{{minSdkVersion}}
minSdk {{minSdkVersion}}
}
}
dependencies {
dependencies {
...
...
packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl
View file @
e1d6f7e8
...
@@ -46,7 +46,7 @@ android {
...
@@ -46,7 +46,7 @@ android {
}
}
defaultConfig {
defaultConfig {
minSdk
Version
{{minSdkVersion}}
minSdk {{minSdkVersion}}
}
}
dependencies {
dependencies {
...
...
packages/flutter_tools/templates/plugin_ffi/android.tmpl/build.gradle.tmpl
View file @
e1d6f7e8
...
@@ -60,6 +60,6 @@ android {
...
@@ -60,6 +60,6 @@ android {
}
}
defaultConfig {
defaultConfig {
minSdk
Version
{{minSdkVersion}}
minSdk {{minSdkVersion}}
}
}
}
}
packages/flutter_tools/test/commands.shard/permeable/create_test.dart
View file @
e1d6f7e8
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment