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
4d404da6
Unverified
Commit
4d404da6
authored
Sep 14, 2019
by
Emmanuel Garcia
Committed by
GitHub
Sep 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Kotlin and Gradle version (#40181)
parent
6f5df21e
Changes
56
Hide whitespace changes
Inline
Side-by-side
Showing
56 changed files
with
66 additions
and
86 deletions
+66
-86
build.gradle
dev/benchmarks/complex_layout/android/build.gradle
+1
-1
gradle-wrapper.properties
...x_layout/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
dev/benchmarks/macrobenchmarks/android/build.gradle
+1
-1
gradle-wrapper.properties
...nchmarks/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
dev/benchmarks/microbenchmarks/android/build.gradle
+1
-1
gradle-wrapper.properties
...nchmarks/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
gradle_plugin_bundle_test.dart
dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart
+5
-5
build.gradle
dev/integration_tests/android_host_app/build.gradle
+1
-1
gradle-wrapper.properties
...android_host_app/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
...tion_tests/android_semantics_testing/android/build.gradle
+1
-1
gradle-wrapper.properties
..._testing/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
dev/integration_tests/android_views/android/build.gradle
+1
-1
gradle-wrapper.properties
...id_views/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
dev/integration_tests/channels/android/build.gradle
+1
-1
gradle-wrapper.properties
...channels/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
dev/integration_tests/codegen/android/build.gradle
+1
-1
gradle-wrapper.properties
.../codegen/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
dev/integration_tests/external_ui/android/build.gradle
+1
-1
gradle-wrapper.properties
...ernal_ui/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
dev/integration_tests/flavors/android/build.gradle
+1
-1
gradle-wrapper.properties
.../flavors/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
dev/integration_tests/image_loading/android/build.gradle
+1
-1
gradle-wrapper.properties
..._loading/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
dev/integration_tests/named_isolates/android/build.gradle
+1
-1
gradle-wrapper.properties
...isolates/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
...tegration_tests/platform_interaction/android/build.gradle
+1
-1
gradle-wrapper.properties
...eraction/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
dev/integration_tests/ui/android/build.gradle
+1
-1
gradle-wrapper.properties
...tests/ui/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
dev/manual_tests/android/build.gradle
+1
-1
gradle-wrapper.properties
...al_tests/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
examples/catalog/android/build.gradle
+1
-1
gradle-wrapper.properties
.../catalog/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
examples/flutter_gallery/android/build.gradle
+1
-1
gradle-wrapper.properties
..._gallery/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
examples/flutter_view/android/build.gradle
+1
-1
gradle-wrapper.properties
...ter_view/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
examples/hello_world/android/build.gradle
+1
-1
gradle-wrapper.properties
...lo_world/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
examples/layers/android/build.gradle
+1
-1
gradle-wrapper.properties
...s/layers/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
examples/platform_channel/android/build.gradle
+1
-1
gradle-wrapper.properties
..._channel/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
examples/platform_view/android/build.gradle
+1
-1
gradle-wrapper.properties
...orm_view/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle
examples/stocks/android/build.gradle
+1
-1
gradle-wrapper.properties
...s/stocks/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
flutter.gradle
packages/flutter_tools/gradle/flutter.gradle
+1
-21
gradle.dart
packages/flutter_tools/lib/src/android/gradle.dart
+2
-2
build.gradle
...lutter_tools/templates/app/android-java.tmpl/build.gradle
+1
-1
build.gradle
...tter_tools/templates/app/android-kotlin.tmpl/build.gradle
+2
-2
gradle-wrapper.properties
...app/android.tmpl/gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle.copy.tmpl
...ls/templates/module/android/gradle/build.gradle.copy.tmpl
+1
-1
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
+2
-2
gradle_test.dart
...flutter_tools/test/general.shard/android/gradle_test.dart
+4
-4
No files found.
dev/benchmarks/complex_layout/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/benchmarks/macrobenchmarks/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/benchmarks/macrobenchmarks/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/benchmarks/microbenchmarks/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/benchmarks/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart
View file @
4d404da6
...
...
@@ -23,7 +23,7 @@ Future<void> main() async {
'outputs'
,
'bundle'
,
'release'
,
'app.aab'
,
'app
-release
.aab'
,
);
checkItContains
<
String
>(<
String
>[
'base/manifest/AndroidManifest.xml'
,
...
...
@@ -54,7 +54,7 @@ Future<void> main() async {
'outputs'
,
'bundle'
,
'productionRelease'
,
'app.aab'
,
'app
-production-release
.aab'
,
);
checkItContains
<
String
>(<
String
>[
'base/manifest/AndroidManifest.xml'
,
...
...
@@ -90,7 +90,7 @@ Future<void> main() async {
'outputs'
,
'bundle'
,
'flavor_underscoreRelease'
,
'app.aab'
,
'app
-flavor_underscore-release
.aab'
,
);
checkItContains
<
String
>(<
String
>[
'base/manifest/AndroidManifest.xml'
,
...
...
@@ -125,7 +125,7 @@ Future<void> main() async {
'outputs'
,
'bundle'
,
'productionRelease'
,
'app.aab'
,
'app
-production-release
.aab'
,
);
checkItContains
<
String
>(<
String
>[
'base/manifest/AndroidManifest.xml'
,
...
...
@@ -149,7 +149,7 @@ Future<void> main() async {
'outputs'
,
'bundle'
,
'release'
,
'app.aab'
,
'app
-release
.aab'
,
);
final
Iterable
<
String
>
bundleFiles
=
await
getFilesInAppBundle
(
releaseBundle
);
...
...
dev/integration_tests/android_host_app/build.gradle
View file @
4d404da6
...
...
@@ -4,7 +4,7 @@ buildscript {
jcenter
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/integration_tests/android_host_app/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/integration_tests/android_semantics_testing/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/integration_tests/android_semantics_testing/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/integration_tests/android_views/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/integration_tests/android_views/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/integration_tests/channels/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/integration_tests/codegen/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/integration_tests/codegen/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/integration_tests/external_ui/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/integration_tests/external_ui/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/integration_tests/flavors/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/integration_tests/image_loading/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/integration_tests/image_loading/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/integration_tests/named_isolates/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/integration_tests/named_isolates/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/integration_tests/platform_interaction/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/integration_tests/platform_interaction/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/integration_tests/ui/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/integration_tests/ui/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
dev/manual_tests/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
dev/manual_tests/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
examples/catalog/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
examples/catalog/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
examples/flutter_gallery/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
examples/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
examples/flutter_view/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
examples/flutter_view/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
examples/hello_world/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
examples/layers/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
examples/layers/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
examples/platform_channel/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
examples/platform_channel/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
examples/platform_view/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
examples/platform_view/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
examples/stocks/android/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
examples/stocks/android/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
packages/flutter_tools/gradle/flutter.gradle
View file @
4d404da6
...
...
@@ -28,7 +28,7 @@ buildscript {
jcenter
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
@@ -974,23 +974,3 @@ class FlutterPluginTask extends DefaultTask {
}
}
}
gradle
.
useLogger
(
new
FlutterEventLogger
())
class
FlutterEventLogger
extends
BuildAdapter
implements
TaskExecutionListener
{
String
mostRecentTask
=
""
void
beforeExecute
(
Task
task
)
{
mostRecentTask
=
task
.
name
}
void
afterExecute
(
Task
task
,
TaskState
state
)
{}
void
buildFinished
(
BuildResult
result
)
{
if
(
result
.
failure
!=
null
)
{
if
(!(
result
.
failure
instanceof
GradleException
)
||
!
mostRecentTask
.
startsWith
(
FlutterPlugin
.
FLUTTER_BUILD_PREFIX
))
{
result
.
rethrowFailure
()
}
}
}
}
packages/flutter_tools/lib/src/android/gradle.dart
View file @
4d404da6
...
...
@@ -403,7 +403,7 @@ bool _isWithinVersionRange(String targetVersion, {String min, String max}) {
parsedTargetVersion
<=
Version
.
parse
(
max
);
}
const
String
defaultGradleVersion
=
'
4.10
.2'
;
const
String
defaultGradleVersion
=
'
5.6
.2'
;
/// Returns the Gradle version that is required by the given Android Gradle plugin version
/// by picking the largest compatible version from
...
...
@@ -440,7 +440,7 @@ String getGradleVersionFor(String androidPluginVersion) {
return
'4.10.2'
;
}
if
(
_isWithinVersionRange
(
androidPluginVersion
,
min:
'3.4.0'
,
max:
'3.5.0'
))
{
return
'5.
1.1
'
;
return
'5.
6.2
'
;
}
throwToolExit
(
'Unsuported Android Plugin version:
$androidPluginVersion
.'
);
return
''
;
...
...
packages/flutter_tools/templates/app/android-java.tmpl/build.gradle
View file @
4d404da6
...
...
@@ -5,7 +5,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
packages/flutter_tools/templates/app/android-kotlin.tmpl/build.gradle
View file @
4d404da6
buildscript
{
ext
.
kotlin_version
=
'1.
2.71
'
ext
.
kotlin_version
=
'1.
3.50
'
repositories
{
google
()
jcenter
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
5.0
'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
...
...
packages/flutter_tools/templates/app/android.tmpl/gradle/wrapper/gradle-wrapper.properties
View file @
4d404da6
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.2-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6
.2-all.zip
packages/flutter_tools/templates/module/android/gradle/build.gradle.copy.tmpl
View file @
4d404da6
...
...
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.
2.1
'
classpath 'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl
View file @
4d404da6
...
...
@@ -8,7 +8,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.
2.1
'
classpath 'com.android.tools.build:gradle:3.
5.0
'
}
}
...
...
packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl
View file @
4d404da6
...
...
@@ -2,14 +2,14 @@ group '{{androidIdentifier}}'
version '1.0-SNAPSHOT'
buildscript {
ext.kotlin_version = '1.
2.71
'
ext.kotlin_version = '1.
3.50
'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.
2.1
'
classpath 'com.android.tools.build:gradle:3.
5.0
'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
...
...
packages/flutter_tools/test/general.shard/android/gradle_test.dart
View file @
4d404da6
...
...
@@ -840,8 +840,8 @@ flutter:
expect
(
getGradleVersionFor
(
'3.3.0'
),
'4.10.2'
);
expect
(
getGradleVersionFor
(
'3.3.2'
),
'4.10.2'
);
expect
(
getGradleVersionFor
(
'3.4.0'
),
'5.
1.1
'
);
expect
(
getGradleVersionFor
(
'3.5.0'
),
'5.
1.1
'
);
expect
(
getGradleVersionFor
(
'3.4.0'
),
'5.
6.2
'
);
expect
(
getGradleVersionFor
(
'3.5.0'
),
'5.
6.2
'
);
});
test
(
'throws on unsupported versions'
,
()
{
...
...
@@ -1014,7 +1014,7 @@ at org.gradle.wrapper.GradleWrapperMain.main(GradleWrapperMain.java:61)''';
'distributionPath=wrapper/dists
\n
'
'zipStoreBase=GRADLE_USER_HOME
\n
'
'zipStorePath=wrapper/dists
\n
'
'distributionUrl=https
\\
://services.gradle.org/distributions/gradle-
4.10
.2-all.zip
\n
'
);
'distributionUrl=https
\\
://services.gradle.org/distributions/gradle-
5.6
.2-all.zip
\n
'
);
},
overrides:
<
Type
,
Generator
>{
Cache:
()
=>
Cache
(
rootOverride:
tempDir
),
FileSystem:
()
=>
memoryFileSystem
,
...
...
@@ -1054,7 +1054,7 @@ at org.gradle.wrapper.GradleWrapperMain.main(GradleWrapperMain.java:61)''';
'distributionPath=wrapper/dists
\n
'
'zipStoreBase=GRADLE_USER_HOME
\n
'
'zipStorePath=wrapper/dists
\n
'
'distributionUrl=https
\\
://services.gradle.org/distributions/gradle-
4.10
.2-all.zip
\n
'
);
'distributionUrl=https
\\
://services.gradle.org/distributions/gradle-
5.6
.2-all.zip
\n
'
);
},
overrides:
<
Type
,
Generator
>{
Cache:
()
=>
Cache
(
rootOverride:
tempDir
),
FileSystem:
()
=>
memoryFileSystem
,
...
...
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