Bug 1255227 - Part 1: Stop using deprecated android-sdk-manager Gradle plugin. r=sebastian draft
authorNick Alexander <nalexander@mozilla.com>
Tue, 18 Jul 2017 09:46:09 -0700
changeset 617641 6cccb53e2ebc2642ee6c61ef13fcb6d8321b67cf
parent 617640 d0dadc96279aff032f6c8558c3763854a42c14d7
child 617642 ef2fb11cf9d75532d5a0c74404998cc450d2719d
push id71104
push usernalexander@mozilla.com
push dateFri, 28 Jul 2017 19:13:32 +0000
reviewerssebastian
bugs1255227
milestone56.0a1
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