github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Upgrade the Gradle script to Android plugin version 3.3.0 (#26913)" (#27045)

Browse Source 
This reverts commit 30f33d6c7d.
This commit is contained in:
Jason Simmons 2019-01-24 14:29:08 -08:00 committed by GitHub
parent 30f33d6c7d
commit 7bfbc28505
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/benchmarks/complex_layout/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
dev/benchmarks/macrobenchmarks/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
dev/benchmarks/microbenchmarks/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
dev/integration_tests/android_host_app/build.gradle
View File

@ -4,7 +4,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
dev/integration_tests/android_semantics_testing/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
dev/integration_tests/android_views/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
dev/integration_tests/channels/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
dev/integration_tests/external_ui/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
dev/integration_tests/flavors/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
dev/integration_tests/named_isolates/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
dev/integration_tests/platform_interaction/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
dev/integration_tests/ui/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
dev/manual_tests/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
examples/catalog/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
examples/flutter_gallery/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
examples/flutter_view/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
examples/hello_world/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
examples/layers/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
examples/platform_channel/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
examples/platform_view/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

2
examples/stocks/android/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

11
packages/flutter_tools/gradle/flutter.gradle
View File

@ -22,7 +22,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }
@ -421,10 +421,9 @@ class FlutterPlugin implements Plugin<Project> {
} }
dependsOn copySharedFlutterAssetsTask dependsOn copySharedFlutterAssetsTask
} else { } else {
Task mergeAssetsTask = variant.mergeAssetsProvider.get() dependsOn variant.mergeAssets
dependsOn mergeAssetsTask dependsOn "clean${variant.mergeAssets.name.capitalize()}"
dependsOn "clean${mergeAssetsTask.name.capitalize()}" into variant.mergeAssets.outputDir
into mergeAssetsTask.outputDir
} }
with flutterTask.assets with flutterTask.assets
} }
@ -436,7 +435,7 @@ class FlutterPlugin implements Plugin<Project> {
mergeAssets.dependsOn(copyFlutterAssetsTask) mergeAssets.dependsOn(copyFlutterAssetsTask)
} }
} else { } else {
variant.outputs[0].processResourcesProvider.get().dependsOn(copyFlutterAssetsTask) variant.outputs[0].processResources.dependsOn(copyFlutterAssetsTask)
} }
} }
if (project.android.hasProperty("applicationVariants")) { if (project.android.hasProperty("applicationVariants")) {

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

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }

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

@ -1,12 +1,12 @@
buildscript { buildscript {
ext.kotlin_version = '1.3.11' ext.kotlin_version = '1.2.71'
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }

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

@ -2,7 +2,7 @@ group '{{androidIdentifier}}'
version '1.0-SNAPSHOT' version '1.0-SNAPSHOT'
buildscript { buildscript {
ext.kotlin_version = '1.3.11' ext.kotlin_version = '1.2.71'
repositories { repositories {
google() google()
jcenter() jcenter()