Merge pull request #159 from ChristianBecker/cb/no_lazy

Removed project.afterEvaluate(…)
robolectric · Jul 8, 2015 · c47909a · c47909a
2 parents 172e411 + 46a806a
commit c47909a
Showing 1 changed file with 19 additions and 21 deletions.
diff --git a/src/main/groovy/org/robolectric/gradle/RobolectricPlugin.groovy b/src/main/groovy/org/robolectric/gradle/RobolectricPlugin.groovy
@@ -1,6 +1,5 @@
 package org.robolectric.gradle
 
-import com.android.build.gradle.api.BaseVariant
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.testing.Test
@@ -14,28 +13,27 @@ class RobolectricPlugin implements Plugin<Project> {
     void apply(Project project) {
         // Configure the project
         def configuration = new Configuration(project)
-        project.afterEvaluate {
-            // Configure the test tasks
-            configuration.variants.all { BaseVariant variant ->
-                def taskName = "test${variant.name.capitalize()}"
-                def assets = variant.mergeAssets.outputDir
-                def manifest = variant.outputs.first().processManifest.manifestOutputFile
-                def resources = variant.mergeResources.outputDir
-                def packageName = project.android.defaultConfig.applicationId
 
-                // Set RobolectricTestRunner properties
-                def task = project.tasks.findByName(taskName) as Test
-                task.systemProperty "android.assets", assets
-                task.systemProperty "android.manifest", manifest
-                task.systemProperty "android.resources", resources
-                task.systemProperty "android.package", packageName
+        // Configure the test tasks
+        configuration.variants.all { variant ->
+            def taskName = "test${variant.name.capitalize()}"
+            def assets = variant.mergeAssets.outputDir
+            def manifest = variant.outputs.first().processManifest.manifestOutputFile
+            def resources = variant.mergeResources.outputDir
+            def packageName = project.android.defaultConfig.applicationId
 
-                project.logger.info("Configuring task: ${taskName}")
-                project.logger.info("Robolectric assets: ${assets}")
-                project.logger.info("Robolectric manifest: ${manifest}")
-                project.logger.info("Robolectric resources: ${resources}")
-                project.logger.info("Robolectric package: ${packageName}")
-            }
+            // Set RobolectricTestRunner properties
+            def task = project.tasks.findByName(taskName) as Test
+            task.systemProperty "android.assets", assets
+            task.systemProperty "android.manifest", manifest
+            task.systemProperty "android.resources", resources
+            task.systemProperty "android.package", packageName
+
+            project.logger.info("Configuring task: ${taskName}")
+            project.logger.info("Robolectric assets: ${assets}")
+            project.logger.info("Robolectric manifest: ${manifest}")
+            project.logger.info("Robolectric resources: ${resources}")
+            project.logger.info("Robolectric package: ${packageName}")
         }
     }
 }