Upgrade android gradle plugin to v3.3.0. Also upgraded plugins that would

otherwise generate warning message (dexcount, play-publisher).
This commit is contained in:
orionlee 2019-01-17 10:18:29 -08:00
parent 1c9b4be17a
commit 62711d9a11
2 changed files with 16 additions and 14 deletions

View File

@ -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 { buildscript {
repositories { repositories {
jcenter() jcenter()
} }
dependencies { 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()
}
def getMyVersionName() { def getMyVersionName() {
def parsedManifestXml = (new XmlSlurper()) def parsedManifestXml = (new XmlSlurper())
.parse("${projectDir}/src/main/AndroidManifest.xml") .parse("${projectDir}/src/main/AndroidManifest.xml")
@ -198,7 +201,7 @@ dependencies {
play { play {
serviceAccountEmail = '522080222319-compute@developer.gserviceaccount.com' serviceAccountEmail = '522080222319-compute@developer.gserviceaccount.com'
pk12File = file('../serviceaccount-c3d7d0f61387.p12') serviceAccountCredentials = file('../serviceaccount-c3d7d0f61387.p12')
} }
// about.html is templatized so that we can automatically insert // about.html is templatized so that we can automatically insert

View File

@ -7,8 +7,7 @@ buildscript {
google() google()
} }
dependencies { 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. // Exclude the version that the android plugin depends on.
configurations.classpath.exclude group: "com.android.tools.external.lombok" configurations.classpath.exclude group: "com.android.tools.external.lombok"
} }
@ -38,7 +37,7 @@ subprojects {
project.ext { project.ext {
compileSdkVersion = 26 compileSdkVersion = 26
buildToolsVersion = "27.0.3" buildToolsVersion = "28.0.3"
minSdkVersion = 14 minSdkVersion = 14
targetSdkVersion = 26 targetSdkVersion = 26