DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

v1.12.13+hotfix.4 cherry-picks (#46632)

Browse Source 
* f264d6c Allow plugins that don't support the Android platform
* 55f0bdc Fix docker tag during upload as well
This commit is contained in:
Todd Volkert 2019-12-09 15:58:15 -08:00 committed by GitHub
parent 57f2df76d7
commit fb60324e6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dev/ci/docker_linux/docker_push.sh
View File

@ -2,5 +2,8 @@
TAG="${CIRRUS_TAG:-latest}"
sudo docker push "gcr.io/flutter-cirrus/build-flutter-image:$TAG"
# Convert "+" to "-" to make hotfix tags legal Docker tag names.
# See https://docs.docker.com/engine/reference/commandline/tag/
TAG=${TAG/+/-}
sudo docker push "gcr.io/flutter-cirrus/build-flutter-image:$TAG"

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

@ -353,7 +353,7 @@ class FlutterPlugin implements Plugin<Project> {
return
}
Project dependencyProject = project.rootProject.findProject(":$pluginDependencyName")
if (dependencyProject == null) {
if (!dependencyProject.projectDir.exists() || dependencyProject == null) {
return
}
// Wait for the Android plugin to load and add the dependency to the plugin project.