Inherit the SDK path from the android plugin

gradle-android-command-plugin/src/main/groovy/com/novoda/gradle/command/AndroidCommandPlugin.groovy

@@ -11,11 +11,27 @@ public class AndroidCommandPlugin implements Plugin<Project> {
         if (!project.plugins.hasPlugin('android')) {
             throw new StopExecutionException("The 'android' plugin is required.")
         }
-        def extension = project.android.extensions.create("command", AndroidCommandPluginExtension, project)
+
+        def androidExtension = project.android
+        String androidHome = getAndroidHome(androidExtension)
+
+        def extension = androidExtension.extensions.create("command", AndroidCommandPluginExtension, project, androidHome)
         extension.task 'installDevice', 'installs the APK on the specified device', Install, ['assemble']
         extension.task 'run', 'installs and runs a APK on the specified device', Run, ['installDevice']
         extension.task 'monkey', 'calls the monkey command on the specified device', Monkey, ['installDevice']
         extension.task 'clearPrefs', 'clears the shared preferences on the specified device', ClearPreferences
         extension.task 'uninstallDevice', 'uninstalls the APK from the specific device', Uninstall
     }
+
+    private static String getAndroidHome(androidExtension) {
+        def androidHome
+        if (androidExtension.hasProperty('sdkHandler')) {
+            androidHome = "${androidExtension.sdkHandler.sdkFolder}"
+        } else if(androidExtension.hasProperty('sdkDirectory')) {
+            androidHome = "${androidExtension.sdkDirectory}"
+        } else {
+            throw new IllegalStateException('The android plugin is not exposing the SDK folder in an expected way.')
+        }
+        androidHome
+    }
 }

gradle-android-command-plugin/src/main/groovy/com/novoda/gradle/command/AndroidCommandPluginExtension.groovy

@@ -3,7 +3,7 @@ import org.gradle.api.Project
 
 public class AndroidCommandPluginExtension {
 
-    def androidHome
+    String androidHome
     def adb
     def aapt
     def deviceId
@@ -13,14 +13,9 @@ public class AndroidCommandPluginExtension {
 
     private final Project project
 
-    AndroidCommandPluginExtension(Project project) {
+    AndroidCommandPluginExtension(Project project, String androidHome) {
         this.project = project
-        androidHome = readSdkDirFromLocalProperties() ?: System.env.ANDROID_HOME
-        if (androidHome == null) {
-            throw new IllegalStateException("Couldn't read the SDK directory. If you're running the tests, " +
-                    "make sure you set the ANDROID_HOME env. variable and it points to your Android SDK home. Otherwise, " +
-                    "make sure there's a local.properties in the root of your project with the property sdk.dir pointing to the Android SDK")
-        }
+        this.androidHome = androidHome
     }
 
     def task(String name, Class<? extends AdbTask> type, Closure configuration) {
@@ -103,15 +98,4 @@ public class AndroidCommandPluginExtension {
         }
         deviceIds[0]
     }
-
-    private def readSdkDirFromLocalProperties() {
-        try {
-            Properties properties = new Properties()
-            properties.load(project.rootProject.file('local.properties').newDataInputStream())
-            properties.getProperty('sdk.dir').trim()
-        }
-        catch (Exception e) {
-            project.getLogger().debug("could not read local.properties", e)
-        }
-    }
 }

gradle-android-command-plugin/src/test/groovy/com/novoda/gradle/command/AndroidCommandPluginExtensionTest.groovy

@@ -2,6 +2,7 @@ package com.novoda.gradle.command
 import org.gradle.testfixtures.ProjectBuilder
 
 class AndroidCommandPluginExtensionTest extends GroovyTestCase {
+    static private final String SDK_PATH = '/some/path'
 
     void testDefaultAdbPath() {
         def extension = createExtension()
@@ -11,7 +12,7 @@ class AndroidCommandPluginExtensionTest extends GroovyTestCase {
 
     void testDefaultAndroidHomePath() {
         def extension = createExtension()
-        assert extension.androidHome != null
+        assert extension.androidHome == SDK_PATH
     }
 
     void testDefaultEvents() {
@@ -27,7 +28,7 @@ class AndroidCommandPluginExtensionTest extends GroovyTestCase {
     private static AndroidCommandPluginExtension createExtension() {
 	def projectDir = new File('..')
         def project = ProjectBuilder.builder().withProjectDir(projectDir).build()
-        def extension = new AndroidCommandPluginExtension(project)
+        def extension = new AndroidCommandPluginExtension(project, SDK_PATH)
         extension
     }
 }