From 5324ee0518ea5299cf3a53cccc05f9ff1137f9f9 Mon Sep 17 00:00:00 2001
From: Sam Stern <samstern@google.com>
Date: Wed, 26 Sep 2018 11:47:59 -0700
Subject: [PATCH] Stabilize Build

Change-Id: I2a1466059e8515d0fa6d4e5d957321ac086883d7
---
 .travis.yml                        | 4 +++-
 buildSrc/src/main/kotlin/Config.kt | 4 ++--
 proguard-tests/build.gradle.kts    | 7 ++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8581a0e96..d7aee02ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,9 @@ android:
 before_script:
   - cp library/google-services.json app/google-services.json
   - cp library/google-services.json proguard-tests/google-services.json
-script: ./gradlew clean assembleDebug proguard-tests:build check
+script:
+  - ./gradlew clean
+  - ./gradlew assembleDebug proguard-tests:build check
 after_success: ./scripts/artifactory.sh
 after_failure:
   # tests
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 5336f8a4a..6c422af83 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -11,9 +11,9 @@ object Config {
     }
 
     object Plugins {
-        const val android = "com.android.tools.build:gradle:3.2.0-rc01"
+        const val android = "com.android.tools.build:gradle:3.2.0-rc03"
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        const val google = "com.google.gms:google-services:4.1.0"
+        const val google = "com.google.gms:google-services:4.0.2"
 
         const val bintray = "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
         const val buildInfo = "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5"
diff --git a/proguard-tests/build.gradle.kts b/proguard-tests/build.gradle.kts
index 5f3f50233..a272fc919 100644
--- a/proguard-tests/build.gradle.kts
+++ b/proguard-tests/build.gradle.kts
@@ -1,3 +1,6 @@
+// This is always set to 'true' on Travis CI
+val inCiBuild = System.getenv("CI") == "true"
+
 android {
     defaultConfig {
         multiDexEnabled = true
@@ -23,7 +26,9 @@ android {
     }
 
     variantFilter {
-        if (name == "debug") setIgnore(true)
+        if (inCiBuild && name == "debug") {
+            setIgnore(true)
+        }
     }
 }