Throw an exception for a missing app id if only one variant is uploaded

x2on · Aug 28, 2015 · 9f92b20 · 9f92b20
1 parent 68c1793
commit 9f92b20
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/main/groovy/de/felixschulze/gradle/HockeyAppPlugin.groovy b/src/main/groovy/de/felixschulze/gradle/HockeyAppPlugin.groovy
@@ -55,6 +55,7 @@ class HockeyAppPlugin implements Plugin<Project> {
             uploadAllTask.group = GROUP_NAME
             uploadAllTask.description = "Uploads all variants to HockeyApp"
             uploadAllTask.outputs.upToDateWhen { false }
+            String uploadAllPath = uploadAllTask.getPath();
 
             android.applicationVariants.all { ApplicationVariant variant ->
                 HockeyAppUploadTask task = project.tasks.create("upload${variant.name.capitalize()}ToHockeyApp", HockeyAppUploadTask)
@@ -64,6 +65,7 @@ class HockeyAppPlugin implements Plugin<Project> {
                 task.variantName = variant.name
                 task.outputs.upToDateWhen { false }
                 task.dependsOn variant.assemble
+                task.uploadAllPath = uploadAllPath
 
                 uploadAllTask.dependsOn(task)
             }

diff --git a/src/main/groovy/de/felixschulze/gradle/HockeyAppUploadTask.groovy b/src/main/groovy/de/felixschulze/gradle/HockeyAppUploadTask.groovy
@@ -61,6 +61,7 @@ class HockeyAppUploadTask extends DefaultTask {
     ApplicationVariant applicationVariant
     boolean mappingFileCouldBePresent = true
     HockeyAppPluginExtension hockeyApp
+    String uploadAllPath
 
 
     HockeyAppUploadTask() {
@@ -138,7 +139,11 @@ class HockeyAppUploadTask extends DefaultTask {
         if (hockeyApp.variantToApplicationId) {
             appId = hockeyApp.variantToApplicationId[variantName]
             if (!appId) {
-                logger.error("Could not resolve app ID for variant: ${variantName} in the variantToApplicationId map.")
+                if(project.getGradle().getTaskGraph().hasTask(uploadAllPath)) {
+                    logger.error("Could not resolve app ID for variant: ${variantName} in the variantToApplicationId map.")
+                } else {
+                    throw new IllegalArgumentException("Could not resolve app ID for variant: ${variantName} in the variantToApplicationId map.")
+                }
             }
         }
         if(appId) {