From d3418a5da4d3986d5d588c70481033470a98da24 Mon Sep 17 00:00:00 2001
From: xster <xiao@xster.net>
Date: Wed, 21 Feb 2018 10:57:21 -0800
Subject: [PATCH] Productionize the publishing Travis shard (#14714)

---
 .travis.yml                                       | 3 ---
 examples/flutter_gallery/android/app/build.gradle | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f3f4c815c1..4480a85785 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,6 @@ matrix:
     env: SHARD=analyze
   - os: osx
     env: SHARD=docs
-  # TODO(xster): remove this when we know it works on Travis.
-  allow_failures:
-  - env: SHARD=build_and_deploy_gallery
 sudo: false
 filter_secrets: false
 
diff --git a/examples/flutter_gallery/android/app/build.gradle b/examples/flutter_gallery/android/app/build.gradle
index a0633f4d30..d5c8744c61 100644
--- a/examples/flutter_gallery/android/app/build.gradle
+++ b/examples/flutter_gallery/android/app/build.gradle
@@ -17,7 +17,9 @@ def flutterVersionComponents = flutterVersion.split(/[^0-9]+/)
 int flutterVersionCode = Math.min(flutterVersionComponents[0].toInteger(), 20) * 100000000
 flutterVersionCode += Math.min(flutterVersionComponents[1].toInteger(), 99) * 1000000
 flutterVersionCode += Math.min(flutterVersionComponents[2].toInteger(), 999) * 1000
-flutterVersionCode += Math.min(flutterVersionComponents[3]?.toInteger() ?: 0, 999)
+if (flutterVersionComponents.length > 3) {
+    flutterVersionCode += Math.min(flutterVersionComponents[3].toInteger(), 999)
+}
 
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"