3 files changed, 9 insertions, 16 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 46b2e01d7..bba300945 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,10 +1,9 @@
 plugins {
-    id('com.github.triplet.play') version '2.2.0'
+    id('com.android.application')
+    id('com.getkeepsafe.dexcount')
+    id('com.github.triplet.play') version '2.3.0' apply false
 }
 
-apply plugin: "com.android.application"
-apply plugin: 'com.getkeepsafe.dexcount'
-
 import org.apache.tools.ant.filters.ReplaceTokens
 
 android {
@@ -185,18 +184,12 @@ dependencies {
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
 }
 
-play {
-    track = 'alpha'
-
-    if (project.hasProperty("antennaPodServiceAccountEmail")) {
+if (project.hasProperty("antennaPodServiceAccountEmail")) {
+    apply plugin: 'com.github.triplet.play'
+    play {
+        track = 'alpha'
         serviceAccountEmail = antennaPodServiceAccountEmail
-    } else {
-        serviceAccountEmail = '522080222319-compute@developer.gserviceaccount.com'
-    }
-    if (project.hasProperty("antennaPodPk12File")) {
         serviceAccountCredentials = file(antennaPodPk12File)
-    } else {
-        serviceAccountCredentials = file('../serviceaccount-c3d7d0f61387.p12')
     }
 }
 
diff --git a/build.gradle b/build.gradle
index 2d917f31f..2ca680ccb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.5'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5f1b1201a..f4d7b2bf6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists