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
de357647
Unverified
Commit
de357647
authored
Dec 20, 2022
by
Camille Simon
Committed by
GitHub
Dec 20, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Android] Bump template AGP and NDK versions (#116536)
* Bump versions * Fix gradle errors test
parent
fdd2d7d6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
flutter.gradle
packages/flutter_tools/gradle/flutter.gradle
+8
-2
gradle_utils.dart
packages/flutter_tools/lib/src/android/gradle_utils.dart
+3
-3
gradle_errors_test.dart
..._tools/test/general.shard/android/gradle_errors_test.dart
+1
-1
No files found.
packages/flutter_tools/gradle/flutter.gradle
View file @
de357647
...
...
@@ -27,7 +27,11 @@ import org.gradle.api.tasks.bundling.Jar
import
org.gradle.internal.os.OperatingSystem
import
org.gradle.util.VersionNumber
/** For apps only. Provides the flutter extension used in app/build.gradle. */
/** For apps only. Provides the flutter extension used in app/build.gradle.
* The versions specified here should match the values used in
* ../lib/src/android/gradle_utils.dart, so when bumping, make sure to update
* the versions specified there.
*/
class
FlutterExtension
{
/** Sets the compileSdkVersion used by default in Flutter app projects. */
static
int
compileSdkVersion
=
33
...
...
@@ -61,7 +65,9 @@ buildscript {
mavenCentral
()
}
dependencies
{
/* When bumping, also update ndkVersion above. */
/** When bumping, also update ndkVersion above, as well as the Android Gradle Plugin
* version in ../lib/src/android/gradle_utils.dart.
*/
classpath
'com.android.tools.build:gradle:7.3.0'
}
}
...
...
packages/flutter_tools/lib/src/android/gradle_utils.dart
View file @
de357647
...
...
@@ -28,8 +28,8 @@ import 'android_sdk.dart';
// https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
// https://kotlinlang.org/docs/releases.html#release-details
const
String
templateDefaultGradleVersion
=
'7.5'
;
const
String
templateAndroidGradlePluginVersion
=
'7.
2
.0'
;
const
String
templateDefaultGradleVersionForModule
=
'7.
2
.0'
;
const
String
templateAndroidGradlePluginVersion
=
'7.
3
.0'
;
const
String
templateDefaultGradleVersionForModule
=
'7.
3
.0'
;
const
String
templateKotlinGradlePluginVersion
=
'1.7.10'
;
// These versions should match the values in flutter.gradle (FlutterExtension).
...
...
@@ -41,7 +41,7 @@ const String templateKotlinGradlePluginVersion = '1.7.10';
const
String
compileSdkVersion
=
'31'
;
const
String
minSdkVersion
=
'16'
;
const
String
targetSdkVersion
=
'31'
;
const
String
ndkVersion
=
'2
1.4.7075529
'
;
const
String
ndkVersion
=
'2
3.1.7779620
'
;
final
RegExp
_androidPluginRegExp
=
RegExp
(
r'com\.android\.tools\.build:gradle:(\d+\.\d+\.\d+)'
);
...
...
packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
View file @
de357647
...
...
@@ -979,7 +979,7 @@ A problem occurred evaluating project ':app'.
'│ To fix this issue, replace the following content: │
\n
'
'│ /android/build.gradle: │
\n
'
"│ - classpath 'com.android.tools.build:gradle:<current-version>' │
\n
"
"│ + classpath 'com.android.tools.build:gradle:7.
2
.0' │
\n
"
"│ + classpath 'com.android.tools.build:gradle:7.
3
.0' │
\n
"
'│ /android/gradle/wrapper/gradle-wrapper.properties: │
\n
'
'│ - https://services.gradle.org/distributions/gradle-<current-version>-all.zip │
\n
'
'│ + https://services.gradle.org/distributions/gradle-7.5-all.zip │
\n
'
...
...
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