Merge pull request #2994 from orionlee/android_gradle_330_upgrade

Upgrade android gradle plugin to v3.3.0

app/build.gradle

@@ -1,23 +1,26 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
-apply plugin: "com.android.application"
-apply plugin: 'com.github.triplet.play'
-apply plugin: 'com.getkeepsafe.dexcount'
-
-repositories {
-    maven { url "https://jitpack.io" }
-    mavenCentral()
-}
-
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.5'
     }
 }
 
+plugins {
+    id('com.github.triplet.play') version '2.0.0'
+}
+
+import org.apache.tools.ant.filters.ReplaceTokens
+
+apply plugin: "com.android.application"
+apply plugin: 'com.getkeepsafe.dexcount'
+
+repositories {
+    maven { url "https://jitpack.io" }
+    mavenCentral()
+}
+
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
@@ -193,9 +196,9 @@ play {
         serviceAccountEmail = '522080222319-compute@developer.gserviceaccount.com'
     }
     if (project.hasProperty("antennaPodPk12File")) {
-        pk12File = file(antennaPodPk12File)
+        serviceAccountCredentials = file(antennaPodPk12File)
     } else {
-        pk12File = file('../serviceaccount-c3d7d0f61387.p12')
+        serviceAccountCredentials = file('../serviceaccount-c3d7d0f61387.p12')
     }
 }
 

build.gradle

@@ -5,8 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.3.0'
-        classpath "com.github.triplet.gradle:play-publisher:1.2.0"
         // Exclude the version that the android plugin depends on.
         configurations.classpath.exclude group: "com.android.tools.external.lombok"
     }
@@ -36,7 +35,7 @@ subprojects {
 
 project.ext {
     compileSdkVersion = 26
-    buildToolsVersion = "27.0.3"
+    buildToolsVersion = "28.0.3"
     minSdkVersion = 14
     targetSdkVersion = 26