Bug 1255227 - Part 1: Stop using deprecated android-sdk-manager Gradle plugin. r=sebastian
This was only ever used to automatically fetch Android SDK
dependencies in the android-gradle-dependencies job in Task Cluster.
That function is now provided by newer Android-Gradle build plugins.
MozReview-Commit-ID: Adrxm2rAPlZ
--- a/build.gradle
+++ b/build.gradle
@@ -42,30 +42,29 @@ buildDir "${topobjdir}/gradle/build"
buildscript {
repositories {
gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
maven {
url repository
}
}
- // For android-sdk-manager SNAPSHOT releases.
+ // For dexcount-gradle-plugin and other in tree plugins.
maven {
url "file://${gradle.mozconfig.topsrcdir}/mobile/android/gradle/m2repo"
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath('com.stanfy.spoon:spoon-gradle-plugin:1.0.4') {
// Without these, we get errors linting.
exclude module: 'guava'
}
// Provided in tree.
- classpath 'com.jakewharton.sdkmanager:gradle-plugin:1.5.0-SNAPSHOT'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.1'
}
}
task generateCodeAndResources(type:Exec) {
workingDir "${topobjdir}"
commandLine mozconfig.substs.GMAKE
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -1,11 +1,10 @@
buildDir "${topobjdir}/gradle/build/mobile/android/app"
-apply plugin: 'android-sdk-manager' // Must come before 'com.android.*'.
apply plugin: 'com.android.application'
apply plugin: 'checkstyle'
apply plugin: 'com.getkeepsafe.dexcount'
apply plugin: 'findbugs'
dexcount {
format = "tree"
}
--- a/mobile/android/geckoview/build.gradle
+++ b/mobile/android/geckoview/build.gradle
@@ -1,11 +1,10 @@
buildDir "${topobjdir}/gradle/build/mobile/android/geckoview"
-apply plugin: 'android-sdk-manager' // Must come before 'com.android.*'.
apply plugin: 'com.android.library'
def VERSION_NAME = '0.0.1'
android {
compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion