diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2019-01-27 11:47:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 11:47:13 +0100 |
| commit | 3b67381656731e2aca2dcca4b14d81a9d113628d (patch) | |
| tree | ccbeaaa5bf5b947c20dcd6c4868ae5f41e5eb175 | |
| parent | 9fe05d96b90fd7cf3a460cedda1056d5f68b0704 (diff) | |
| parent | 7f37987bda32c7838746246258be3d055018ef1e (diff) | |
| download | AntennaPod-3b67381656731e2aca2dcca4b14d81a9d113628d.zip | |
Merge pull request #2994 from orionlee/android_gradle_330_upgrade
Upgrade android gradle plugin to v3.3.0
| -rw-r--r-- | app/build.gradle | 27 | ||||
| -rw-r--r-- | build.gradle | 5 |
2 files changed, 17 insertions, 15 deletions
diff --git a/app/build.gradle b/app/build.gradle index 55e15f130..c53f61088 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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') } } diff --git a/build.gradle b/build.gradle index e23440374..3759b7db4 100644 --- a/build.gradle +++ b/build.gradle @@ -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 |