Fixed custom namespace for apks

DeployGate · Sep 26, 2018 · 78965e6 · 78965e6
1 parent 211668f
commit 78965e6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/example-for-dev/app/build.gradle b/example-for-dev/app/build.gradle
@@ -43,7 +43,7 @@ deploygate {
     apks {
         custom {
             noAssemble = true
-            sourceFile = file("${project.projectDir}/app/build/outputs/apk/debug/app-debug.apk")
+            sourceFile = file("${project.projectDir}/build/outputs/apk/p1//debug/app-p1-debug.apk")
         }
     }
 }
diff --git a/src/main/groovy/com/deploygate/gradle/plugins/DeployGate.groovy b/src/main/groovy/com/deploygate/gradle/plugins/DeployGate.groovy
@@ -37,9 +37,16 @@ class DeployGate implements Plugin<Project> {
 
     private static Set<String> setupExtension(Project project) {
         NamedDomainObjectContainer<DeployTarget> targets = project.container(DeployTarget)
+
+        def declaredVariantNames = new HashSet<>()
+
+        targets.all {
+            declaredVariantNames.add(name)
+        }
+
         project.extensions.add('deploygate', new DeployGateExtension(targets))
 
-        return targets.collect { it.name }.toSet()
+        return declaredVariantNames
     }
 
     def createDeployGateTasks(Project project, Set<String> declaredVariantNames) {
@@ -48,7 +55,7 @@ class DeployGate implements Plugin<Project> {
 
         createMultipleUploadApkTask(project, declaredVariantNames)
 
-        def names = new HashSet(declaredVariantNames)
+        def names = new HashSet<String>(declaredVariantNames)
 
         // @see ApplicationVariantFactory#createVariantData
         // variant is for applicationFlavors
@@ -65,7 +72,6 @@ class DeployGate implements Plugin<Project> {
         }
 
         names.collect { ApkInfoCompat.blank(it) }.each { apkInfo ->
-
             createUploadApkTask(project, apkInfo)
         }
     }