Bug 1255227 - Part 1: Stop using deprecated android-sdk-manager Gradle plugin. r=sebastian
authorNick Alexander <nalexander@mozilla.com>
Tue, 18 Jul 2017 09:46:09 -0700
changeset 371707 5b150868209b49cb505d11a5ec8cacc67f90542e
parent 371706 3878c778174cad892c6b0956cf40d2593c030366
child 371708 23330f35f95778ef167c583ddd3e2c99e96198c2
push id47554
push usernalexander@mozilla.com
push dateFri, 28 Jul 2017 21:43:55 +0000
treeherderautoland@23330f35f957 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssebastian
bugs1255227
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
build.gradle
mobile/android/app/build.gradle
mobile/android/geckoview/build.gradle
--- 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