Merge pull request #2994 from orionlee/android_gradle_330_upgrade

Upgrade android gradle plugin to v3.3.0
This commit is contained in:
Martin Fietz 2019-01-27 11:47:13 +01:00 committed by GitHub
commit 3b67381656
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 15 deletions

View File

@ -1,7 +1,19 @@
buildscript {
repositories {
jcenter()
}
dependencies {
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.github.triplet.play'
apply plugin: 'com.getkeepsafe.dexcount'
repositories {
@ -9,15 +21,6 @@ repositories {
mavenCentral()
}
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
}
}
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')
}
}

View File

@ -5,8 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.0'
classpath "com.github.triplet.gradle:play-publisher:1.2.0"
classpath 'com.android.tools.build:gradle:3.3.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